fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 11:11:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Support order_default attribute to <index> tag in XML query

Browse source
This commit is contained in:
Kijin Sung 2022-12-18 01:18:55 +09:00
parent 2a3f5d3c51
commit 4cc730e489
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/parsers/baseparser.php
View file

@ -11,17 +11,17 @@ abstract class BaseParser
* Get all attributes of an element as an associative array. * Get all attributes of an element as an associative array.
* *
* @param SimpleXMLElement $element * @param SimpleXMLElement $element
* @param bool $remove_symbols * @param bool $normalize
* @return array * @return array
*/ */
protected static function _getAttributes(\SimpleXMLElement $element, $remove_symbols = true): array protected static function _getAttributes(\SimpleXMLElement $element, $normalize = true): array
{ {
$result = array(); $result = array();
foreach ($element->attributes() as $key => $val) foreach ($element->attributes() as $key => $val)
{ {
if ($remove_symbols) if ($normalize)
{ {
$key = preg_replace('/[^a-z]/', '', $key); $key = strtolower(preg_replace('/[^a-zA-Z]/', '', $key));
} }
$result[trim($key)] = trim($val); $result[trim($key)] = trim($val);
} }

8
common/framework/parsers/dbqueryparser.php
View file

@ -190,10 +190,12 @@ class DBQueryParser extends BaseParser
$query->navigation = new DBQuery\Navigation; $query->navigation = new DBQuery\Navigation;
foreach ($xml->navigation->index ?: [] as $tag) foreach ($xml->navigation->index ?: [] as $tag)
{ {
$attribs = self::_getAttributes($tag, true);
$orderby = new DBQuery\OrderBy; $orderby = new DBQuery\OrderBy;
$orderby->var = trim($tag['var']) ?: null; $orderby->var = ($attribs['var'] ?? null) ?: null;
$orderby->default = trim($tag['default']) ?: null; $orderby->default = ($attribs['default'] ?? null) ?: null;
$orderby->order_var = trim($tag['order']) ?: null; $orderby->order_var = ($attribs['order'] ?? null) ?: null;
$orderby->order_default = strtoupper($attribs['orderdefault'] ?? '') === 'DESC' ? 'DESC' : 'ASC';
$query->navigation->orderby[] = $orderby; $query->navigation->orderby[] = $orderby;
} }
foreach (['list_count', 'page_count', 'page', 'offset'] as $key) foreach (['list_count', 'page_count', 'page', 'offset'] as $key)

2
tests/_data/dbquery/selectTest1.xml
View file

@ -13,7 +13,7 @@
</group> </group>
</conditions> </conditions>
<navigation> <navigation>
<index var="sort_index" default="list_order" order="order_type" /> <index var="sort_index" default="list_order" order="order_type" order_default="desc" />
<list_count var="list_count" default="20" /> <list_count var="list_count" default="20" />
<page_count var="page_count" default="10" /> <page_count var="page_count" default="10" />
<page var="page" default="1" /> <page var="page" default="1" />

4
tests/unit/framework/parsers/DBQueryParserTest.php
View file

@ -37,7 +37,7 @@ class DBQueryParserTest extends \Codeception\TestCase\Test
$this->assertEquals('sort_index', $query->navigation->orderby[0]->var); $this->assertEquals('sort_index', $query->navigation->orderby[0]->var);
$this->assertEquals('list_order', $query->navigation->orderby[0]->default); $this->assertEquals('list_order', $query->navigation->orderby[0]->default);
$this->assertEquals('order_type', $query->navigation->orderby[0]->order_var); $this->assertEquals('order_type', $query->navigation->orderby[0]->order_var);
$this->assertEquals('ASC', $query->navigation->orderby[0]->order_default); $this->assertEquals('DESC', $query->navigation->orderby[0]->order_default);
$this->assertTrue($query->navigation->list_count instanceof Rhymix\Framework\Parsers\DBQuery\VariableBase); $this->assertTrue($query->navigation->list_count instanceof Rhymix\Framework\Parsers\DBQuery\VariableBase);
$this->assertEquals('list_count', $query->navigation->list_count->var); $this->assertEquals('list_count', $query->navigation->list_count->var);
$this->assertEquals('20', $query->navigation->list_count->default); $this->assertEquals('20', $query->navigation->list_count->default);
@ -49,7 +49,7 @@ class DBQueryParserTest extends \Codeception\TestCase\Test
public function testSimpleSelect() public function testSimpleSelect()
{ {
$query = Rhymix\Framework\Parsers\DBQueryParser::loadXML(\RX_BASEDIR . 'tests/_data/dbquery/selectTest1.xml'); $query = Rhymix\Framework\Parsers\DBQueryParser::loadXML(\RX_BASEDIR . 'tests/_data/dbquery/selectTest1.xml');
$args = array('member_srl' => 1234, 'regdate_more' => '20200707120000', 'page' => 3); $args = array('member_srl' => 1234, 'regdate_more' => '20200707120000', 'page' => 3, 'order_type' => 'asc');
$sql = $query->getQueryString('rx_', $args); $sql = $query->getQueryString('rx_', $args);
$params = $query->getQueryParams(); $params = $query->getQueryParams();