Prevent syntax error on query with trailling semicolon (#142)

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

Author: staabm

.phpunit-phpstan-dba.cache

@@ -2,64 +2,6 @@
   'schemaVersion' => 'v3-rename-props',
   'records' => 
   array (
-    '
-            SELECT email adaid
-            WHERE gesperrt = \'1\' AND email LIKE \'%@example.com\'
-            FROM ada
-            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/MariaDB server version for the right syntax to use near \'FROM ada LIMIT 0\' at line 3',
-         'code' => 1064,
-      )),
-    ),
-    '
-            SELECT email, adaid
-            FROM ada
-            WHERE gesperrt = \'1\'
-            LIMIT        \'1\'
-        ' => 
-    array (
-      'error' => NULL,
-    ),
-    '
-            SELECT email, adaid
-            FROM ada
-            WHERE gesperrt = \'1\'
-            LIMIT        \'1\',  \'1\'
-        ' => 
-    array (
-      'error' => NULL,
-    ),
-    '
-            SELECT email, adaid
-            FROM ada
-            WHERE gesperrt = \'1\'
-            LIMIT   \'1\',     \'1\'
-        ' => 
-    array (
-      'error' => NULL,
-    ),
-    '
-            SELECT email, adaid
-            FROM ada
-            WHERE gesperrt = \'1\' AND email LIKE \'%@example%\'
-            LIMIT        1
-        ' => 
-    array (
-      'error' => NULL,
-    ),
-    '
-            SELECT email, adaid
-            FROM ada
-            WHERE gesperrt = \'1\' AND email LIKE NULL
-            LIMIT        1
-        ' => 
-    array (
-      'error' => NULL,
-    ),
     '
             SELECT email adaid
             WHERE gesperrt = \'1\' AND email LIKE \'%@example.com\'
@@ -3038,5 +2980,9 @@ Simulated query: SELECT email, adaid, gesperrt, freigabe1u1 FROM ada . WHERE ema
          'code' => 1064,
       )),
     ),
+    'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada;' => 
+    array (
+      'error' => NULL,
+    ),
   ),
 );

src/QueryReflection/QuerySimulation.php

@@ -86,6 +86,8 @@ public static function simulate(string $queryString): ?string
 
     private static function stripTraillingLimit(string $queryString): ?string
     {
+        $queryString = rtrim($queryString, ';');
+
         // XXX someday we will use a proper SQL parser,
         // which would also allow us to support even more complex expressions like SELECT .. LIMIT X, Y FOR UPDATE
         return preg_replace('/\s*LIMIT\s+["\']?\d+["\']?\s*(,\s*["\']?\d*["\']?)?\s*$/i', '', $queryString);

tests/data/syntax-error-in-prepared-statement.php

@@ -143,4 +143,10 @@ public function samePlaceholderMultipleTimes(Connection $connection)
             WHERE (gesperrt=:gesperrt AND freigabe1u1=1) OR (gesperrt=:gesperrt AND freigabe1u1=0)';
         $connection->preparedQuery($query, [':gesperrt' => 1]);
     }
+
+    public function noErrorOnTraillingSemicolon(Connection $connection)
+    {
+        $query = 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada;';
+        $connection->preparedQuery($query, []);
+    }
 }