Merge branch 'alextech-bugfix/order_no_trim'

metalinspired · Feb 23, 2017 · 24aece5 · 24aece5
2 parents dac89e4 + ca9daaf
commit 24aece5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/Sql/Select.php b/src/Sql/Select.php
@@ -651,7 +651,7 @@ protected function processOrder(PlatformInterface $platform, DriverInterface $dr
                     $v = self::ORDER_ASCENDING;
                 }
             }
-            if (strtoupper($v) == self::ORDER_DESCENDING) {
+            if (strcasecmp(trim($v), self::ORDER_DESCENDING) === 0) {
                 $orders[] = [$platform->quoteIdentifierInFragment($k), self::ORDER_DESCENDING];
             } else {
                 $orders[] = [$platform->quoteIdentifierInFragment($k), self::ORDER_ASCENDING];

diff --git a/test/Sql/SelectTest.php b/test/Sql/SelectTest.php
@@ -10,14 +10,14 @@
 namespace ZendTest\Db\Sql;
 
 use ReflectionObject;
-use Zend\Db\Sql\Select;
+use Zend\Db\Adapter\ParameterContainer;
+use Zend\Db\Adapter\Platform\Sql92;
 use Zend\Db\Sql\Expression;
-use Zend\Db\Sql\Where;
 use Zend\Db\Sql\Having;
 use Zend\Db\Sql\Predicate;
+use Zend\Db\Sql\Select;
 use Zend\Db\Sql\TableIdentifier;
-use Zend\Db\Adapter\ParameterContainer;
-use Zend\Db\Adapter\Platform\Sql92;
+use Zend\Db\Sql\Where;
 use ZendTest\Db\TestAsset\TrustingSql92Platform;
 
 class SelectTest extends \PHPUnit_Framework_TestCase
@@ -422,6 +422,20 @@ public function testOrder()
         );
     }
 
+    /**
+     * @testdox unit test: Test order() correctly splits parameters.
+     * @covers Zend\Db\Sql\Select::order
+     */
+    public function testOrderCorrectlySplitsParameter()
+    {
+        $select = new Select;
+        $select->order('name  desc');
+        $this->assertEquals(
+            'SELECT * ORDER BY "name" DESC',
+            $select->getSqlString(new TrustingSql92Platform())
+        );
+    }
+
     /**
      * @testdox: unit test: test limit()
      * @covers Zend\Db\Sql\Select::limit