Further improve type guessing

squirrelphp · May 4, 2022 · d2748de · d2748de
1 parent 4348cb5
commit d2748de
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
+<files psalm-version="4.23.0@f1fe6ff483bf325c803df9f510d09a03fd796f88">
   <file src="src/MultiRepositoryReadOnly.php">
     <MissingConstructor occurrences="2">
       <code>$db</code>
@@ -8,6 +8,10 @@
     <PossiblyInvalidArgument occurrences="1">
       <code>$sanitizedOptions['query']</code>
     </PossiblyInvalidArgument>
+    <RedundantCondition occurrences="2">
+      <code>\strval(\floatval($value)) !== $value</code>
+      <code>\strval(\intval($value)) !== $value</code>
+    </RedundantCondition>
   </file>
   <file src="src/RepositoryReadOnly.php">
     <ArgumentTypeCoercion occurrences="3">

diff --git a/src/MultiRepositoryReadOnly.php b/src/MultiRepositoryReadOnly.php
@@ -781,16 +781,28 @@ private function processSelectResult(
                 continue;
             }
 
+            // Test boolean and numeric values to make sure we do not lose information
             if ($selectTypes[$key] === 'ubool') {
+                // Only accept 0 and 1 - all other values are not necessarily boolean
                 if ($value === '0' || $value === '1') {
                     $selectTypes[$key] = 'bool';
                 } else {
                     $selectTypes[$key] = 'string';
                 }
             } elseif ($selectTypes[$key] === 'uint' || $selectTypes[$key] === 'ufloat') {
-                if (!\is_numeric($value)) {
+                // Non-numeric values are kept as string
+                if (
+                    !\is_numeric($value)
+                    || \strval(\floatval($value)) !== $value
+                ) {
                     $selectTypes[$key] = 'string';
-                } else {
+                } elseif (
+                    // Numeric values where we lose some information when converting to integer are kept as a string
+                    $selectTypes[$key] === 'uint'
+                    && \strval(\intval($value)) !== $value
+                ) {
+                    $selectTypes[$key] = 'string';
+                } else { // No information loss detected, use int or float type
                     $selectTypes[$key] = \substr($selectTypes[$key], 1);
                 }
             }

diff --git a/tests/MultiRepositoryReadOnlyTest.php b/tests/MultiRepositoryReadOnlyTest.php
@@ -177,6 +177,7 @@ function ($p) {
                 'updateMinusCreated' => ':ticket.lastUpdate:-:ticket.createDate:',
                 'floaty' => ':ticket.floaty:',
                 'booleany' => ':ticket.open:',
+                'integery' => ':ticket.lastUpdate:/2',
                 'updateCreatedConcat' => 'CONCAT(:ticket.lastUpdate:,:ticket.createDate:)',
             ],
             'tables' => [
@@ -825,6 +826,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => '5',
                 'floaty' => '9.5',
                 'booleany' => '1',
+                'integery' => '1',
                 'updateCreatedConcat' => '5',
             ],
             [
@@ -837,6 +839,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => '8',
                 'floaty' => '2022-05-04',
                 'booleany' => '0',
+                'integery' => '5',
                 'updateCreatedConcat' => '5',
             ],
             [
@@ -849,6 +852,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => '53',
                 'floaty' => '3.3',
                 'booleany' => '1',
+                'integery' => '1.5',
                 'updateCreatedConcat' => '5',
             ],
         ];
@@ -865,6 +869,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => 5,
                 'floaty' => 9.5,
                 'booleany' => true,
+                'integery' => 1,
                 'updateCreatedConcat' => '5',
             ],
             [
@@ -877,6 +882,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => 8,
                 'floaty' => '2022-05-04',
                 'booleany' => false,
+                'integery' => 5,
                 'updateCreatedConcat' => '5',
             ],
             [
@@ -889,6 +895,7 @@ public function testComplicatedQuery(): void
                 'updateMinusCreated' => 53,
                 'floaty' => 3.3,
                 'booleany' => true,
+                'integery' => '1.5',
                 'updateCreatedConcat' => '5',
             ],
         ];
@@ -910,6 +917,8 @@ public function testComplicatedQuery(): void
                 $this->db->quoteIdentifier('floaty'),
                 '(' . $this->db->quoteIdentifier('ticket.ticket_open') . ') AS ' .
                 $this->db->quoteIdentifier('booleany'),
+                '(' . $this->db->quoteIdentifier('ticket.last_update') . '/2) AS ' .
+                $this->db->quoteIdentifier('integery'),
                 '(CONCAT(' . $this->db->quoteIdentifier('ticket.last_update') . ',' .
                 $this->db->quoteIdentifier('ticket.create_date') . ')) AS ' .
                 $this->db->quoteIdentifier('updateCreatedConcat'),