-
-
Notifications
You must be signed in to change notification settings - Fork 25
Preserve reflector-derived column types when AST narrowing yields ErrorType #777
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ArtemGoutsoul
wants to merge
1
commit into
staabm:main
Choose a base branch
from
ArtemGoutsoul:fix/parser-inference-alias-qualified-error-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+85
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace staabm\PHPStanDba\Tests; | ||
|
|
||
| use PHPStan\Type\Constant\ConstantArrayType; | ||
| use PHPStan\Type\Constant\ConstantStringType; | ||
| use PHPStan\Type\IntegerRangeType; | ||
| use PHPStan\Type\StringType; | ||
| use PHPStan\Type\Type; | ||
| use PHPStan\Type\VerbosityLevel; | ||
| use PHPUnit\Framework\TestCase; | ||
| use staabm\PHPStanDba\SchemaReflection\SchemaReflection; | ||
| use staabm\PHPStanDba\SqlAst\ParserInference; | ||
|
|
||
| class ParserInferenceTest extends TestCase | ||
| { | ||
| /** | ||
| * Regression: with FETCH_TYPE_ASSOC the reflector-derived row shape is | ||
| * string-keyed only. Reading an integer offset on it returns ErrorType | ||
| * under PHPStan >= 2.2 (previously a benign type). For alias-qualified | ||
| * columns (`t.col`) QueryScope::resolveExpression() returns MixedType, | ||
| * so the ErrorType used to be written over the (correct) reflector type | ||
| * under the column name key, collapsing the row shape to | ||
| * `array{col: *ERROR*, ...}`. | ||
| * | ||
| * @dataProvider provideAliasedAndUnaliasedQueries | ||
| */ | ||
| public function testAssocOnlyRowShapeIsPreservedForAliasedColumns(string $sql): void | ||
| { | ||
| $serviceGroupIdType = IntegerRangeType::fromInterval(0, 4294967295); | ||
| $nameType = new StringType(); | ||
|
|
||
| // mysqli FETCH_TYPE_ASSOC row shape: ONLY string keys, no integer offsets. | ||
| $resultType = new ConstantArrayType( | ||
| [ | ||
| new ConstantStringType('service_group_id'), | ||
| new ConstantStringType('name'), | ||
| ], | ||
| [ | ||
| $serviceGroupIdType, | ||
| $nameType, | ||
| ] | ||
| ); | ||
|
|
||
| $schema = new SchemaReflection(static function (string $query) use ($resultType): ?Type { | ||
| if (stripos($query, 'SELECT * FROM service_group') === 0) { | ||
| return $resultType; | ||
| } | ||
| return null; | ||
| }); | ||
|
|
||
| $inference = new ParserInference($schema); | ||
| $narrowed = $inference->narrowResultType($sql, $resultType); | ||
|
|
||
| self::assertSame( | ||
| 'array{service_group_id: int<0, 4294967295>, name: string}', | ||
| $narrowed->describe(VerbosityLevel::precise()) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @return iterable<string, array{string}> | ||
| */ | ||
| public function provideAliasedAndUnaliasedQueries(): iterable | ||
| { | ||
| yield 'unqualified columns' => [ | ||
| 'SELECT service_group_id, name FROM service_group', | ||
| ]; | ||
| yield 'alias-qualified columns' => [ | ||
| 'SELECT sg.service_group_id, sg.name FROM service_group sg', | ||
| ]; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could we check
$resultType->hasOffsetValueType()before we call$resultType->getOffsetValueTypeinstead?