close pdo cursor after handling results

staabm · Jan 18, 2023 · a88d42c · a88d42c
1 parent e0f23fd
commit a88d42c
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 35 deletions.
diff --git a/src/Analyzer/QueryPlanAnalyzerMysql.php b/src/Analyzer/QueryPlanAnalyzerMysql.php
@@ -57,7 +57,10 @@ public function analyze(string $query): QueryPlanResult
                 $stmt = $this->connection->query($simulatedQuery);
 
                 // @phpstan-ignore-next-line
-                return $this->buildResult($simulatedQuery, $stmt);
+                $planResult = $this->buildResult($simulatedQuery, $stmt);
+                $stmt->closeCursor();
+
+                return $planResult;
             } finally {
                 $this->connection->rollBack();
             }
@@ -67,7 +70,10 @@ public function analyze(string $query): QueryPlanResult
             try {
                 $result = $this->connection->query($simulatedQuery);
                 if ($result instanceof \mysqli_result) {
-                    return $this->buildResult($simulatedQuery, $result);
+                    $planResult = $this->buildResult($simulatedQuery, $result);
+                    $result->close();
+
+                    return $planResult;
                 }
             } finally {
                 $this->connection->rollback();

diff --git a/src/DbSchema/SchemaHasherMysql.php b/src/DbSchema/SchemaHasherMysql.php
@@ -68,6 +68,7 @@ public function hashDb(): string
                 foreach ($stmt as $row) {
                     $hash = $row['dbsignature'] ?? '';
                 }
+                $stmt->closeCursor();
             } finally {
                 $this->connection->rollBack();
             }
@@ -80,6 +81,7 @@ public function hashDb(): string
                     $row = $result->fetch_assoc();
                     $hash = $row['dbsignature'] ?? '';
                 }
+                $result->close();
             } finally {
                 $this->connection->rollback();
             }

diff --git a/src/QueryReflection/PdoMysqlQueryReflector.php b/src/QueryReflection/PdoMysqlQueryReflector.php
@@ -82,6 +82,8 @@ protected function simulateQuery(string $queryString)
             ++$columnIndex;
         }
 
+        $stmt->closeCursor();
+
         return $this->cache[$queryString];
     }
 
@@ -107,20 +109,24 @@ protected function checkInformationSchema(string $tableName): Iterator
             );
         }
 
-        $this->stmt->execute([$tableName]);
-        $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        foreach ($result as $row) {
-            $extra = $row['EXTRA'];
-            $columnType = $row['COLUMN_TYPE'];
-            $columnName = $row['COLUMN_NAME'];
-
-            if (str_contains($extra, 'auto_increment')) {
-                yield $columnName => TypeMapper::FLAG_AUTO_INCREMENT;
-            }
-            if (str_contains($columnType, 'unsigned')) {
-                yield $columnName => TypeMapper::FLAG_UNSIGNED;
+        try {
+            $this->stmt->execute([$tableName]);
+            $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
+
+            foreach ($result as $row) {
+                $extra = $row['EXTRA'];
+                $columnType = $row['COLUMN_TYPE'];
+                $columnName = $row['COLUMN_NAME'];
+
+                if (str_contains($extra, 'auto_increment')) {
+                    yield $columnName => TypeMapper::FLAG_AUTO_INCREMENT;
+                }
+                if (str_contains($columnType, 'unsigned')) {
+                    yield $columnName => TypeMapper::FLAG_UNSIGNED;
+                }
             }
+        } finally {
+            $this->stmt->closeCursor();
         }
     }
 }
diff --git a/src/QueryReflection/PdoPgSqlQueryReflector.php b/src/QueryReflection/PdoPgSqlQueryReflector.php
@@ -56,12 +56,7 @@ protected function simulateQuery(string $queryString)
         } catch (PDOException $e) {
             return $this->cache[$queryString] = $e;
         } finally {
-            try {
-                $this->pdo->rollBack();
-            } catch (PDOException $e) {
-                // not all drivers may support transactions
-                throw new \RuntimeException('Failed to rollback transaction', $e->getCode(), $e);
-            }
+            $this->pdo->rollBack();
         }
 
         $this->cache[$queryString] = [];
@@ -91,6 +86,8 @@ protected function simulateQuery(string $queryString)
             ++$columnIndex;
         }
 
+        $stmt->closeCursor();
+
         return $this->cache[$queryString];
     }
 
@@ -114,21 +111,25 @@ protected function checkInformationSchema(string $tableName): Iterator
             );
         }
 
-        $this->stmt->execute([$tableName]);
-        $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        /** @var array{column_default?: string, column_name: string, is_nullable: string} $row */
-        foreach ($result as $row) {
-            $default = $row['column_default'] ?? '';
-            $columnName = $row['column_name'];
-            $isNullable = 'YES' === $row['is_nullable'];
-
-            if (!$isNullable) {
-                yield $columnName => PgsqlTypeMapper::FLAG_NOT_NULL;
-            }
-            if (str_contains($default, 'nextval')) {
-                yield $columnName => PgsqlTypeMapper::FLAG_AUTO_INCREMENT;
+        try {
+            $this->stmt->execute([$tableName]);
+            $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
+
+            /** @var array{column_default?: string, column_name: string, is_nullable: string} $row */
+            foreach ($result as $row) {
+                $default = $row['column_default'] ?? '';
+                $columnName = $row['column_name'];
+                $isNullable = 'YES' === $row['is_nullable'];
+
+                if (!$isNullable) {
+                    yield $columnName => PgsqlTypeMapper::FLAG_NOT_NULL;
+                }
+                if (str_contains($default, 'nextval')) {
+                    yield $columnName => PgsqlTypeMapper::FLAG_AUTO_INCREMENT;
+                }
             }
+        } finally {
+            $this->stmt->closeCursor();
         }
     }
 }