Do not convert int parameters in array to string

smi2 · Jun 27, 2018 · 9de99be · 9de99be
1 parent 579b4cf
commit 9de99be
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 23 deletions.
diff --git a/src/Query/Degeneration/Bindings.php b/src/Query/Degeneration/Bindings.php
@@ -3,13 +3,22 @@
 namespace ClickHouseDB\Query\Degeneration;
 
 use DateTimeInterface;
+use function array_map;
+use function implode;
+use function is_array;
+use function is_float;
+use function is_int;
+use function is_string;
+use function sprintf;
+use function str_ireplace;
 
 class Bindings implements \ClickHouseDB\Query\Degeneration
 {
     /**
      * @var array
      */
     protected $bindings = [];
+
     /**
      * @param array $bindings
      */
@@ -23,7 +32,7 @@ public function bindParams(array $bindings)
 
     /**
      * @param string $column
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function bindParam($column, $value)
     {
@@ -73,11 +82,10 @@ private function escapeArray($values)
                 $escapedValues[] = $this->escapeArray($value);
             }
         }
-        
+
         return $escapedValues;
     }
 
-
     /**
      * Compile Bindings
      *
@@ -92,43 +100,59 @@ public function process($sql)
 
         arsort($this->bindings);
 
-
         foreach ($this->bindings as $key => $value) {
+            $valueSet           = null;
+            $formattedParameter = null;
 
-
-            $valueSet = null;
-            $valueSetText = null;
-
-            if (null === $value || $value === false) {
-                $valueSetText = "";
+            if ($value === null || $value === false) {
+                $formattedParameter = '';
             }
 
             if (is_array($value)) {
-                $escapedValue = $this->escapeArray($value);
-                $valueSetText = "'" . implode("','", $escapedValue) . "'";
-                $valueSet = implode(", ", $escapedValue);
+                $escapedValues = $this->escapeArray($value);
+
+                $escapedValues = array_map(
+                    function ($escapedValue) {
+                        if (is_string($escapedValue)) {
+                            return $this->formatStringParameter($escapedValue);
+                        }
+
+                        return $escapedValue;
+                    },
+                    $escapedValues
+                );
+
+                $formattedParameter = implode(',', $escapedValues);
+                $valueSet           = implode(', ', $escapedValues);
             }
 
-            if (is_numeric($value)) {
-                $valueSetText = $value;
-                $valueSet = $value;
+            if (is_float($value) || is_int($value)) {
+                $formattedParameter = $value;
+                $valueSet           = $value;
             }
 
             if (is_string($value)) {
-                $valueSet = $value;
-                $valueSetText = "'" . $this->escapeString($value) . "'";
+                $valueSet           = $value;
+                $formattedParameter = $this->formatStringParameter($this->escapeString($value));
             }
 
-            if ($valueSetText !== null) {
-                $sql = str_ireplace(':' . $key, $valueSetText, $sql);
+            if ($formattedParameter !== null) {
+                $sql = str_ireplace(':' . $key, $formattedParameter, $sql);
             }
 
             if ($valueSet !== null) {
                 $sql = str_ireplace('{' . $key . '}', $valueSet, $sql);
             }
         }
 
-        return ($sql);
+        return $sql;
     }
 
+    /**
+     * @return string
+     */
+    private function formatStringParameter(string $value)
+    {
+        return sprintf("'%s'", $value);
+    }
 }
diff --git a/tests/BindingsTest.php b/tests/BindingsTest.php
@@ -32,8 +32,8 @@ public function escapeDataProvider()
             ],
             [
                 'select * from test. WHERE id IN (:id)',
-                ['id' => ['1', 2]],
-                "select * from test. WHERE id IN ('1','2')",
+                ['id' => [1, 2]],
+                'select * from test. WHERE id IN (1,2)',
             ],
             [
                 'select * from test. WHERE id IN (:id)',