Fix QueryPlanAnalyser with dynamic offset and limit params (#390)

* Fix QueryPlanAnalyser with dynamic offset and limit params

The QueryPlanAnalyser does not strip trailing limits and offsets.
If limits and offsets are set via parameters it would escape the limits and offsets as strings.
This resulted in incorrect SQL being analysed.

* revert fix

* fix

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

Author: keulinho

.phpstan-dba-mysqli.cache

@@ -2,14 +2,16 @@
 
 declare(strict_types=1);
 
-namespace staabm\PHPStanDba\QueryReflection;
+namespace staabm\PHPStanDba\Analyzer;
 
 use PhpParser\Node\Expr;
 use PHPStan\Analyser\Scope;
 use PHPStan\Type\Type;
+use staabm\PHPStanDba\QueryReflection\QueryReflection;
+use staabm\PHPStanDba\QueryReflection\QuerySimulation;
 use staabm\PHPStanDba\UnresolvableQueryException;
 
-final class QueryResolver
+final class QueryPlanQueryResolver
 {
     /**
      * @return iterable<string>
@@ -32,7 +34,11 @@ public function resolve(Scope $scope, Expr $queryExpr, ?Type $parameterTypes): i
         }
 
         foreach ($queryStrings as $queryString) {
-            yield $queryString;
+            $normalizedQuery = QuerySimulation::stripTrailers($queryString);
+
+            if (null !== $normalizedQuery) {
+                yield $normalizedQuery;
+            }
         }
     }
 }

.phpstan-dba-pdo-mysql.cache

@@ -15,6 +15,7 @@
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use staabm\PHPStanDba\Analyzer\QueryPlanAnalyzerMysql;
+use staabm\PHPStanDba\Analyzer\QueryPlanQueryResolver;
 use staabm\PHPStanDba\Analyzer\QueryPlanResult;
 use staabm\PHPStanDba\DbaException;
 use staabm\PHPStanDba\Error;
@@ -430,7 +431,7 @@ public function analyzeQueryPlan(Scope $scope, Expr $queryExpr, ?Type $parameter
         }
         $queryPlanAnalyzer = new QueryPlanAnalyzerMysql($ds);
 
-        $queryResolver = new QueryResolver();
+        $queryResolver = new QueryPlanQueryResolver();
         foreach ($queryResolver->resolve($scope, $queryExpr, $parameterTypes) as $queryString) {
             if ('' === $queryString) {
                 continue;

src/QueryReflection/QueryResolver.php renamed to src/Analyzer/QueryPlanQueryResolver.php

@@ -124,7 +124,7 @@ public static function simulateParamValueType(Type $paramType, bool $preparedPar
 
     public static function simulate(string $queryString): ?string
     {
-        $queryString = self::stripTraillingLimit($queryString);
+        $queryString = self::stripTrailers($queryString);
 
         if (null === $queryString) {
             return null;
@@ -134,7 +134,7 @@ public static function simulate(string $queryString): ?string
         return $queryString;
     }
 
-    private static function stripTraillingLimit(string $queryString): ?string
+    public static function stripTrailers(string $queryString): ?string
     {
         // XXX someday we will use a proper SQL parser
         $queryString = rtrim($queryString);

src/QueryReflection/QueryReflection.php

@@ -16,9 +16,12 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
+use staabm\PHPStanDba\Tests\QueryPlanAnalyzerRuleTest;
 
 /**
  * @implements Rule<CallLike>
+ *
+ * @see QueryPlanAnalyzerRuleTest
  */
 final class QueryPlanAnalyzerRule implements Rule
 {