Fix sql ast type inference on raw-sql expression without aliases (#582)

Author: jakubvojacek

.phpstan-dba-pdo-mysql.cache

@@ -25,7 +25,7 @@
 		"vlucas/phpdotenv": "^5.4"
 	},
 	"conflict": {
-		"sqlftw/sqlftw": "<0.1.6 || >0.1.7"
+		"sqlftw/sqlftw": "<0.1.10"
 	},
 	"autoload": {
 		"psr-4": {
@@ -81,6 +81,7 @@
 		"phpstan": [
 			"phpstan analyse -c phpstan.neon.dist",
 			"phpstan analyse -c tests/default/config/phpstan.neon.dist",
+			"phpstan analyse -c tests/sqlAst/config/phpstan.neon.dist",
 			"phpstan analyse -c tests/rules/config/phpstan.neon.dist",
 			"phpstan analyse -c tests/stringify/config/phpstan.neon.dist",
 			"phpstan analyse -c tests/defaultFetchAssoc/config/phpstan.neon.dist",
@@ -93,6 +94,7 @@
 		],
 		"phpunit": [
 			"phpunit -c tests/default/config/phpunit.xml",
+			"phpunit -c tests/sqlAst/config/phpunit.xml",
 			"phpunit -c tests/rules/config/phpunit.xml",
 			"phpunit -c tests/stringify/config/phpunit.xml",
 			"phpunit -c tests/defaultFetchAssoc/config/phpunit.xml",

composer.json

@@ -140,6 +140,10 @@ public function narrowResultType(string $queryString, ConstantArrayType $resultT
             if ($exprName !== null) {
                 $nameType = new ConstantStringType($exprName);
             }
+            $rawExpressionType = null;
+            if ($column->getRawExpression() !== null) {
+                $rawExpressionType = new ConstantStringType($column->getRawExpression());
+            }
             $aliasOffsetType = null;
             if (null !== $column->getAlias()) {
                 $aliasOffsetType = new ConstantStringType($column->getAlias());
@@ -152,6 +156,12 @@ public function narrowResultType(string $queryString, ConstantArrayType $resultT
                 $valueType = $type;
             }
 
+            if (null !== $rawExpressionType && $resultType->hasOffsetValueType($rawExpressionType)->yes()) {
+                $resultType = $resultType->setOffsetValueType(
+                    $rawExpressionType,
+                    $valueType
+                );
+            }
             if (null !== $aliasOffsetType && $resultType->hasOffsetValueType($aliasOffsetType)->yes()) {
                 $resultType = $resultType->setOffsetValueType(
                     $aliasOffsetType,

src/SqlAst/ParserInference.php

@@ -62,10 +62,6 @@ public function dataFileAsserts(): iterable
         yield from $this->gatherAssertTypes(__DIR__ . '/data/mysqli-union-result.php');
         yield from $this->gatherAssertTypes(__DIR__ . '/data/pdo-default-fetch-types.php');
         yield from $this->gatherAssertTypes(__DIR__ . '/data/bug372.php');
-
-        if (\PHP_VERSION_ID >= 70400 && 'pdo-pgsql' !== getenv('DBA_REFLECTOR')) {
-            yield from $this->gatherAssertTypes(__DIR__ . '/data/sql-ast-narrowing.php');
-        }
     }
 
     /**