prepared statements: more types

Author: bolner

.vscode/c_cpp_properties.json

@@ -9,7 +9,7 @@
             "compilerPath": "/usr/bin/g++",
             "cStandard": "gnu11",
             "cppStandard": "gnu++11",
-            "intelliSenseMode": "clang-x64",
+            "intelliSenseMode": "gcc-x64",
             "compilerArgs": [
                 "-lssl"
             ]

src/Connection.php

@@ -506,14 +506,23 @@ private function WritePreparedStatement(string $sql, array $params) {
                     $escaped[] = preg_replace('/[^0-9\.]/', '', $param);
                 }
                 else if ($type == "timestamp") {
-                    $escaped[] = "TIMESTAMP '".preg_replace('/[^0-9\.\-\: ]/', '', $param)."'";
+                    $escaped[] = "TIMESTAMP '".$this->Escape($param)."'";
                 }
+                else if ($type == "int" || $type == "bigint") {
+                    $escaped[] = (string)((int)$param);
+                }
+                else if ($type == "double" || $type == "real") {
+                    $escaped[] = (string)((float)$param);
+                }
+
+                // TODO: TIME, INTERVAL, boolean, binary ?
+
                 else {
-                    $escaped[] = @"'".$this->Escape((string)$param)."'";
+                    $escaped[] = "'".$this->Escape($param)."'";
                 }
             }
-            elseif (is_numeric($param) && !is_string($param)) {
-                $escaped[] = $param + 0;
+            elseif (is_float($param) || is_integer($param)) {
+                $escaped[] = (string)$param;
             }
             elseif ($param instanceof DateTime) {
                 if ($type == "date") {
@@ -523,11 +532,17 @@ private function WritePreparedStatement(string $sql, array $params) {
                 }
             }
             else {
-                $escaped[] = @"'".$this->Escape((string)$param)."'";
+                $gotType = gettype($param);
+                if ($gotType == "object") {
+                    $gotType = get_class($param);
+                }
+
+                throw new MonetException("Parameter ".($index + 1)." has invalid PHP type: '{$gotType}'. "
+                    ."(Expected SQL type: '{$type}'.)");
             }
         }
 
-        $this->Write("sEXECUTE {$id}(".implode(",", $escaped).");");
+        $this->Write("sEXECUTE {$id}(".implode(", ", $escaped).");");
     }
 
     /**

tests/preparedTest.php

@@ -46,10 +46,12 @@ public function testDec38(): void {
 
     public function testInt32(): void {
         $this->InsertValuePrepared('i', 123456, '123456');
+        $this->InsertValuePrepared('i', '123456', '123456');
     }
 
     public function testInt64(): void {
         $this->InsertValuePrepared('b', 1234567890987654321, '1234567890987654321');
+        $this->InsertValuePrepared('b', '1234567890987654321', '1234567890987654321');
     }
 
     public function testTimestamp(): void {
@@ -69,4 +71,20 @@ public function testDate(): void {
         $ts = new DateTime();
         $this->InsertValuePrepared('dat', $ts, $ts->format('Y-m-d'));
     }
+
+    public function testDouble(): void {
+        $this->InsertValuePrepared('f', 3.14159265, '3.14159265');
+        $this->InsertValuePrepared('f', '3.14159265', '3.14159265');
+
+        $this->InsertValuePrepared('dbl', 3.14159265, '3.14159265');
+        $this->InsertValuePrepared('dbl', '3.14159265', '3.14159265');
+
+        $this->InsertValuePrepared('dbl2', 3.14159265, '3.14159265');
+        $this->InsertValuePrepared('dbl2', '3.14159265', '3.14159265');
+    }
+
+    public function testReal(): void {
+        $this->InsertValuePrepared('r', 3.141592, '3.141592');
+        $this->InsertValuePrepared('r', '3.141592', '3.141592');
+    }
 }