Merge pull request #213 from envms/fix/literal-in-where

Fix instances of FluentLiteral not taken literally in where
envms · Oct 12, 2017 · b172d58 · b172d58
2 parents ad319cd + 33c9f3f
commit b172d58
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/FluentPDO/BaseQuery.php b/FluentPDO/BaseQuery.php
@@ -307,11 +307,13 @@ protected function buildParameters() {
                     if (is_array($value) && is_string(key($value)) && substr(key($value), 0, 1) == ':') {
                         // this is named params e.g. (':name' => 'Mark')
                         $parameters = array_merge($parameters, $value);
-                    } else {
+                    }
+                    else {
                         $parameters[] = $value;
                     }
                 }
-            } else {
+            }
+            else {
                 if ($clauses) {
                     $parameters[] = $clauses;
                 }

diff --git a/FluentPDO/CommonQuery.php b/FluentPDO/CommonQuery.php
@@ -85,7 +85,15 @@ public function where($condition, $parameters = array()) {
                 return $this->addStatement('WHERE', "$condition IN $in");
             }
 
-            $condition = "$condition = ?";
+            // don't parameterize the value if it's an instance of FluentLiteral
+            if ($parameters instanceof FluentLiteral) {
+                $condition = "{$condition} = {$parameters}";
+
+                return $this->addStatement('WHERE', $condition);
+            }
+            else {
+                $condition = "$condition = ?";
+            }
         }
 
         array_shift($args);

diff --git a/FluentPDO/FluentUtils.php b/FluentPDO/FluentUtils.php
@@ -24,11 +24,12 @@ public static function toUpperWords($string) {
      */
     public static function formatQuery($query) {
         $query = preg_replace(
-            '/\b(WHERE|FROM|GROUP BY|HAVING|ORDER BY|LIMIT|OFFSET|UNION|ON DUPLICATE KEY UPDATE|VALUES|SET)/',
+            '/\b(WHERE|FROM|GROUP BY|HAVING|ORDER BY|LIMIT|OFFSET|UNION|ON DUPLICATE KEY UPDATE|VALUES|SET)\b/',
             "\n$0", $query
         );
+
         $query = preg_replace(
-            '/\b(INNER|OUTER|LEFT|RIGHT|FULL|CASE|WHEN|END|ELSE|AND)/',
+            '/\b(INNER|OUTER|LEFT|RIGHT|FULL|CASE|WHEN|END|ELSE|AND)\b/',
             "\n    $0", $query
         );