Merge pull request #17 from dmaechler/fix_simple_functions

adding limit paramerizable and get it functional, then fixing bug on order by case with params

Author: moufmouf

src/SQLParser/Query/Select.php

@@ -372,27 +372,29 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
             throw new \Exception('There is no offset if no limit is provided. An error may have occurred during SQLParsing.');
         } else if (!empty($this->limit)) {
             $limit = NodeFactory::toSql($this->limit, $dbConnection, $parameters, ',', false, $indent + 2, $conditionsMode);
-            if ($limit === '') {
+            if ($limit === '' || substr(trim($limit), 0, 1) == ':') {
                 $limit = null;
             }
             if (!empty($this->offset)) {
                 $offset = NodeFactory::toSql($this->offset, $dbConnection, $parameters, ',', false, $indent + 2, $conditionsMode);
-                if ($offset === '') {
+                if ($offset === '' || substr(trim($offset), 0, 1) == ':') {
                     $offset = null;
                 }
             } else {
                 $offset = null;
             }
 
-
             if ($limit === null && $offset !== null) {
                 throw new \Exception('There is no offset if no limit is provided. An error may have occurred during SQLParsing.');
             }
-            $sql .= "\nLIMIT ";
-            if ($offset !== null) {
-                $sql .= $offset.', ';
+
+            if($limit !== null) {
+                $sql .= "\nLIMIT ";
+                if ($offset !== null) {
+                    $sql .= $offset.', ';
+                }
+                $sql .= $limit;
             }
-            $sql .= $limit;
         }
 
         return $sql;

tests/Mouf/Database/MagicQueryTest.php

@@ -12,6 +12,28 @@ public function testStandardSelect()
     {
         $magicQuery = new MagicQuery();
 
+        $sql = "SELECT id FROM users WHERE name LIKE :name LIMIT :offset, :limit";
+        $this->assertEquals("SELECT id FROM users WHERE name LIKE 'foo'", self::simplifySql($magicQuery->build($sql, ['name' => 'foo'])));
+
+        $sql = "SELECT id FROM users WHERE name LIKE :name LIMIT 2, :limit";
+        $this->assertEquals("SELECT id FROM users WHERE name LIKE 'foo' LIMIT 2, 10", self::simplifySql($magicQuery->build($sql, ['name' => 'foo', 'limit' => 10])));
+
+        try {
+            $exceptionOccurred = false;
+            $sql = "SELECT id FROM users WHERE name LIKE :name LIMIT 2, :limit";
+            self::simplifySql($magicQuery->build($sql, ['name' => 'foo']));
+        } catch(\Exception $e) {
+            // We have no limit provided in the parameters so we test that the script return an exception for this case
+            $exceptionOccurred = true;
+        }
+        $this->assertEquals(true, $exceptionOccurred);
+
+        $sql = "SELECT id FROM users WHERE name LIKE :name LIMIT :offset, 5";
+        $this->assertEquals("SELECT id FROM users WHERE name LIKE 'foo' LIMIT 0, 5", self::simplifySql($magicQuery->build($sql, ['name' => 'foo', 'offset' => 0])));
+
+        $sql = "SELECT id FROM users WHERE name LIKE :name LIMIT :offset, 5";
+        $this->assertEquals("SELECT id FROM users WHERE name LIKE 'foo' LIMIT 5", self::simplifySql($magicQuery->build($sql, ['name' => 'foo'])));
+
         $sql = "SELECT id FROM users LIMIT 10";
         $this->assertEquals("SELECT id FROM users LIMIT 10", self::simplifySql($magicQuery->build($sql)));