Don't report syntax error on incomplete query (#26)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

.phpstan-dba.cache

@@ -468,6 +468,18 @@
         )),
       ),
     ),
+    'SELECT email, adaid, gesperrt, freigabe1u1 FROM  LIMIT 1' => 
+    array (
+      'error' => 
+      staabm\PHPStanDba\Error::__set_state(array(
+         'message' => 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'LIMIT 0\' at line 1',
+         'code' => 1064,
+      )),
+      'result' => 
+      array (
+        1 => NULL,
+      ),
+    ),
     'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada' => 
     array (
       'error' => NULL,

composer.json

@@ -34,6 +34,9 @@
 		],
 		"phpstan": [
 			"phpstan analyse -c phpstan.neon.dist"
+		],
+		"phpunit": [
+			"phpunit"
 		]
 	},
 	"config": {

src/QueryReflection/QueryReflection.php

@@ -86,15 +86,11 @@ private function resolveQueryString(Expr $expr, Scope $scope): ?string
             $leftString = $this->resolveQueryString($left, $scope);
             $rightString = $this->resolveQueryString($right, $scope);
 
-            if ($leftString && $rightString) {
-                return $leftString.$rightString;
-            }
-            if ($leftString) {
-                return $leftString;
-            }
-            if ($rightString) {
-                return $rightString;
+            if (null === $leftString || null === $rightString) {
+                return null;
             }
+
+            return $leftString.$rightString;
         }
 
         $type = $scope->getType($expr);

tests/data/runMysqlQuery.php

@@ -25,6 +25,8 @@ class Foo
     public function run(string $prodHostname, DbCredentials $dbCredentials)
     {
         $prodDomains = runMysqlQuery('SELECT cmsdomainid FROM cmsdomain WHERE url ="'.$prodHostname.'" and standard=1', $dbCredentials);
-        assertType('array<int, array{string}>|null', $prodDomains);
+        assertType('array<int, array<int, string>>|null', $prodDomains);
+        // XXX should be more precise, when we would be smarter in query parsing
+        // assertType('array<int, array{string}>|null', $prodDomains);
     }
 }

tests/data/syntax-error-in-query.php

@@ -41,6 +41,11 @@ public function unknownTable(PDO $pdo)
         $pdo->query('SELECT * FROM unknownTable', PDO::FETCH_ASSOC);
     }
 
+    public function incompleteQuery(PDO $pdo, string $tableName)
+    {
+        $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM '.$tableName.' LIMIT 1', PDO::FETCH_ASSOC);
+    }
+
     public function validQuery(PDO $pdo)
     {
         $pdo->query('SELECT email, adaid, gesperrt, freigabe1u1 FROM ada', PDO::FETCH_ASSOC);