Skip to content

QueryResultTypeWalker: support pdo_pgsql float fetches on PHP 8.4 #607

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 9, 2024
Merged

QueryResultTypeWalker: support pdo_pgsql float fetches on PHP 8.4 #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c376d4
QueryResultTypeWalker: support pdo_pgsql float fetches on PHP 8.4
janedbal Sep 9, 2024
bb5c744
Fix asserts, add Dockerfile for PHP 8.4
janedbal Sep 9, 2024
17233e8
Remove commented code
janedbal Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/Type/Doctrine/Descriptors/FloatType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,12 @@ public function getDatabaseInternalTypeForDriver(Connection $connection): Type
{
$driverType = $this->driverDetector->detect($connection);

if ($driverType === DriverDetector::PDO_PGSQL) {
return new IntersectionType([
new StringType(),
new AccessoryNumericStringType(),
]);
}

if (in_array($driverType, [
DriverDetector::SQLITE3,
DriverDetector::PDO_SQLITE,
DriverDetector::MYSQLI,
DriverDetector::PDO_MYSQL,
DriverDetector::PDO_PGSQL,
DriverDetector::PGSQL,
], true)) {
return new \PHPStan\Type\FloatType();
Expand Down
38 changes: 13 additions & 25 deletions src/Type/Doctrine/Query/QueryResultTypeWalker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,6 @@ public function walkFunction($function): string
}

if ($this->containsOnlyNumericTypes($exprTypeNoNull)) {
if ($this->driverType === DriverDetector::PDO_PGSQL) {
return $this->marshalType($this->createNumericString($nullable));
}

return $this->marshalType($exprType); // retains underlying type
}

Expand Down Expand Up @@ -627,13 +623,7 @@ public function walkFunction($function): string
$type = TypeCombinator::addNull($type);
}

} elseif ($this->driverType === DriverDetector::PDO_PGSQL) {
$type = new IntersectionType([
new StringType(),
new AccessoryNumericStringType(),
]);

} elseif ($this->driverType === DriverDetector::PGSQL) {
} elseif ($this->driverType === DriverDetector::PGSQL || $this->driverType === DriverDetector::PDO_PGSQL) {
$castedExprType = $this->castStringLiteralForNumericExpression($exprTypeNoNull);

if ($castedExprType->isInteger()->yes() || $castedExprType->isFloat()->yes()) {
Expand Down Expand Up @@ -1771,12 +1761,6 @@ private function inferPlusMinusTimesType(array $termTypes): Type
return $this->createInteger($nullable);
}

if ($this->driverType === DriverDetector::PDO_PGSQL) {
if ($this->containsOnlyNumericTypes($unionWithoutNull)) {
return $this->createNumericString($nullable);
}
}

if ($this->driverType === DriverDetector::SQLITE3 || $this->driverType === DriverDetector::PDO_SQLITE) {
if (!$this->containsOnlyNumericTypes(...$typesNoNull)) {
return new MixedType();
Expand All @@ -1791,7 +1775,7 @@ private function inferPlusMinusTimesType(array $termTypes): Type
return $this->createFloatOrInt($nullable);
}

if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::PGSQL) {
if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::PGSQL || $this->driverType === DriverDetector::PDO_PGSQL) {
if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType()])) {
return $this->createFloat($nullable);
}
Expand Down Expand Up @@ -1857,12 +1841,6 @@ private function inferDivisionType(array $termTypes): Type
return new MixedType();
}

if ($this->driverType === DriverDetector::PDO_PGSQL) {
if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType(), $this->createNumericString(false)])) {
return $this->createNumericString($nullable);
}
}

if ($this->driverType === DriverDetector::SQLITE3 || $this->driverType === DriverDetector::PDO_SQLITE) {
if (!$this->containsOnlyNumericTypes(...$typesNoNull)) {
return new MixedType();
Expand All @@ -1877,7 +1855,7 @@ private function inferDivisionType(array $termTypes): Type
return $this->createFloatOrInt($nullable);
}

if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::PGSQL) {
if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::PGSQL || $this->driverType === DriverDetector::PDO_PGSQL) {
if ($this->containsOnlyTypes($unionWithoutNull, [new IntegerType(), new FloatType()])) {
return $this->createFloat($nullable);
}
Expand Down Expand Up @@ -2100,6 +2078,9 @@ private function hasAggregateWithoutGroupBy(): bool
* - pdo_sqlite: https://github.com/php/php-src/commit/438b025a28cda2935613af412fc13702883dd3a2
* - pdo_pgsql: https://github.com/php/php-src/commit/737195c3ae6ac53b9501cfc39cc80fd462909c82
*
* Notable 8.4 changes:
* - pdo_pgsql: https://github.com/php/php-src/commit/6d10a6989897e9089d62edf939344437128e93ad
*
* @param IntegerType|FloatType|BooleanType $type
*/
private function shouldStringifyExpressions(Type $type): TrinaryLogic
Expand Down Expand Up @@ -2144,7 +2125,14 @@ private function shouldStringifyExpressions(Type $type): TrinaryLogic
}

return TrinaryLogic::createNo();
}

if ($type->isFloat()->yes()) {
if ($this->phpVersion->getVersionId() >= 80400) {
return TrinaryLogic::createFromBoolean($stringifyFetches);
}

return TrinaryLogic::createYes();
}

return TrinaryLogic::createFromBoolean($stringifyFetches);
Expand Down
Loading