From c00339c85fb13a86b3b13a6425422c331d23c675 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Wed, 2 Aug 2023 11:33:13 +0200
Subject: [PATCH] Improve `ext/pdo_pgsql` tests cleanup

---
 ext/pdo_pgsql/tests/bug46274.phpt          | 10 ++++++----
 ext/pdo_pgsql/tests/bug46274_2.phpt        | 10 ++++++----
 ext/pdo_pgsql/tests/bug66584.phpt          |  6 ++++++
 ext/pdo_pgsql/tests/bug67462.phpt          |  6 ++++++
 ext/pdo_pgsql/tests/bug70861.phpt          |  9 ++++++++-
 ext/pdo_pgsql/tests/bug72633.phpt          |  9 ++++++---
 ext/pdo_pgsql/tests/bug75402.phpt          |  7 ++++++-
 ext/pdo_pgsql/tests/bug_33876.phpt         |  7 ++++++-
 ext/pdo_pgsql/tests/bug_49985.phpt         |  7 ++++++-
 ext/pdo_pgsql/tests/copy_from.phpt         |  7 ++++++-
 ext/pdo_pgsql/tests/copy_to.phpt           |  7 ++++++-
 ext/pdo_pgsql/tests/is_in_transaction.phpt |  8 ++++++--
 ext/pdo_pgsql/tests/large_objects.phpt     |  8 ++++++--
 13 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt
index eef234c12076c..610db81a0451c 100644
--- a/ext/pdo_pgsql/tests/bug46274.phpt
+++ b/ext/pdo_pgsql/tests/bug46274.phpt
@@ -21,7 +21,6 @@ try {
 } catch (Exception $e) {
 }
 
-$db->query('DROP TABLE IF EXISTS test_one_blob_46274_1 CASCADE');
 $db->query('CREATE TABLE test_one_blob_46274_1 (id SERIAL NOT NULL, blob1 BYTEA)');
 
 $stmt = $db->prepare("INSERT INTO test_one_blob_46274_1 (blob1) VALUES (:foo)");
@@ -62,9 +61,12 @@ var_dump($res->fetch());
 
 // NULL
 var_dump($res->fetch());
-
-$db->query('DROP TABLE test_one_blob_46274_1');
-
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test_one_blob_46274_1');
 ?>
 --EXPECT--
 array(2) {
diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt b/ext/pdo_pgsql/tests/bug46274_2.phpt
index 7a17e66b54d86..21dce8cbf4091 100644
--- a/ext/pdo_pgsql/tests/bug46274_2.phpt
+++ b/ext/pdo_pgsql/tests/bug46274_2.phpt
@@ -21,7 +21,6 @@ try {
 } catch (Exception $e) {
 }
 
-$db->query('DROP TABLE IF EXISTS test_one_blob_46274_2 CASCADE');
 $db->query('CREATE TABLE test_one_blob_46274_2 (id SERIAL NOT NULL, blob1 BYTEA)');
 
 $stmt = $db->prepare("INSERT INTO test_one_blob_46274_2 (blob1) VALUES (:foo)");
@@ -65,9 +64,12 @@ var_dump(fread($x['blob1'], 10));
 
 // NULL
 var_dump($res->fetch());
-
-$db->query('DROP TABLE test_one_blob_46274_2');
-
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test_one_blob_46274_2');
 ?>
 --EXPECTF--
 array(2) {
diff --git a/ext/pdo_pgsql/tests/bug66584.phpt b/ext/pdo_pgsql/tests/bug66584.phpt
index 010a1d229e96e..1df28e037afa3 100644
--- a/ext/pdo_pgsql/tests/bug66584.phpt
+++ b/ext/pdo_pgsql/tests/bug66584.phpt
@@ -56,6 +56,12 @@ function run($pdo, $data)
     var_dump($stmt->fetchColumn());
 }
 
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$pdo = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$pdo->query("DROP TABLE IF EXISTS b66584");
 ?>
 --EXPECTF--
 int(3)
diff --git a/ext/pdo_pgsql/tests/bug67462.phpt b/ext/pdo_pgsql/tests/bug67462.phpt
index e9d7a40be01f3..b3e85fee96df8 100644
--- a/ext/pdo_pgsql/tests/bug67462.phpt
+++ b/ext/pdo_pgsql/tests/bug67462.phpt
@@ -29,6 +29,12 @@ try {
     var_dump($pdo->beginTransaction());
 }
 
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$pdo = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$pdo->query("DROP TABLE IF EXISTS b67462");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/pdo_pgsql/tests/bug70861.phpt b/ext/pdo_pgsql/tests/bug70861.phpt
index 5ac4f043a99d7..e64c97f12c1e6 100644
--- a/ext/pdo_pgsql/tests/bug70861.phpt
+++ b/ext/pdo_pgsql/tests/bug70861.phpt
@@ -21,7 +21,6 @@ try {
 } catch (Exception $e) {
 }
 
-$db->query('DROP TABLE IF EXISTS test_blob_crash_70861 CASCADE');
 $db->query('CREATE TABLE test_blob_crash_70861 (id SERIAL NOT NULL, blob1 BYTEA)');
 
 class HelloWrapper {
@@ -41,8 +40,16 @@ $stmt->execute();
 
 fclose($f);
 
+$db->exec('DROP TABLE test_blob_crash');
+
 ?>
 +++DONE+++
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test_blob_crash_70861 CASCADE');
+?>
 --EXPECTF--
 %a
 +++DONE+++
diff --git a/ext/pdo_pgsql/tests/bug72633.phpt b/ext/pdo_pgsql/tests/bug72633.phpt
index 2d8c5683f1275..6f60577075e27 100644
--- a/ext/pdo_pgsql/tests/bug72633.phpt
+++ b/ext/pdo_pgsql/tests/bug72633.phpt
@@ -18,7 +18,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
-$db->query('DROP TABLE IF EXISTS test_last_id_72633 CASCADE');
 $db->query('CREATE TABLE test_last_id_72633 (id SERIAL NOT NULL, field1 VARCHAR(10))');
 
 $stmt = $db->prepare("INSERT INTO test_last_id_72633 (field1) VALUES ('test')");
@@ -34,8 +33,12 @@ var_dump($db->lastInsertId());
  */
 var_dump($db->lastInsertId('test_last_id_72633_id_seq'));
 
-$db->query('DROP TABLE test_last_id_72633');
-
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test_last_id_72633');
 ?>
 --EXPECTREGEX--
 string\([0-9]*\)\ \"[0-9]*\"
diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt
index f09625a833c45..db0820e365139 100644
--- a/ext/pdo_pgsql/tests/bug75402.phpt
+++ b/ext/pdo_pgsql/tests/bug75402.phpt
@@ -17,7 +17,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $resp = new \stdClass();
 $resp->entries = [];
 
-$db->query('DROP TABLE IF EXISTS bug75402 CASCADE');
 $db->query('CREATE TABLE bug75402 (
     "id" character varying(64) NOT NULL,
     "group_id" character varying(64) NOT NULL,
@@ -84,6 +83,12 @@ if ($db) {
 
 var_dump($resp);
 ?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->exec('DROP TABLE IF EXISTS bug75402');
+?>
 --EXPECT--
 object(stdClass)#2 (1) {
   ["entries"]=>
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
index 1a1842ee2340a..6b062f6ceb167 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -16,7 +16,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
 $db->exec("SET LC_MESSAGES='C'");
-$db->query('DROP TABLE IF EXISTS b33876 CASCADE');
 $db->exec('CREATE TABLE b33876 (foo varchar(5) NOT NULL, bar bool NOT NULL)');
 $db->exec("INSERT INTO b33876 VALUES('false','f')");
 $db->exec("INSERT INTO b33876 VALUES('true', 't')");
@@ -95,6 +94,12 @@ function normalizeErrorInfo(array $err): array {
     return $err;
 }
 
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS b33876 CASCADE');
 ?>
 --EXPECTF--
 Array
diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt
index 870e69e02ffef..b1ba388655e01 100644
--- a/ext/pdo_pgsql/tests/bug_49985.phpt
+++ b/ext/pdo_pgsql/tests/bug_49985.phpt
@@ -15,7 +15,6 @@ require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
 $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-$db->query('DROP TABLE IF EXISTS b49985 CASCADE');
 $db->exec("CREATE TABLE b49985 (a int PRIMARY KEY)");
 
 for ($i = 0; $i < 3; $i++) {
@@ -30,6 +29,12 @@ for ($i = 0; $i < 3; $i++) {
     }
 }
 
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS b49985 CASCADE');
 ?>
 --EXPECTF--
 bool(true)
diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt
index 65669dfd78ed0..5bb46531329a8 100644
--- a/ext/pdo_pgsql/tests/copy_from.phpt
+++ b/ext/pdo_pgsql/tests/copy_from.phpt
@@ -16,7 +16,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
-$db->query('DROP TABLE IF EXISTS test_copy_from CASCADE');
 $db->exec('CREATE TABLE test_copy_from (a integer not null primary key, b text, c integer)');
 
 echo "Preparing test file and array for CopyFrom tests\n";
@@ -127,6 +126,12 @@ foreach (array($filename, $filenameWithDifferentNullValues, $filenameWithDiffere
     @unlink($f);
 }
 ?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->query('DROP TABLE IF EXISTS test_copy_from CASCADE');
+?>
 --EXPECTF--
 Preparing test file and array for CopyFrom tests
 Testing pgsqlCopyFromArray() with default parameters
diff --git a/ext/pdo_pgsql/tests/copy_to.phpt b/ext/pdo_pgsql/tests/copy_to.phpt
index f0e0bdf0f5bb9..add5cdd3a08e8 100644
--- a/ext/pdo_pgsql/tests/copy_to.phpt
+++ b/ext/pdo_pgsql/tests/copy_to.phpt
@@ -16,7 +16,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
-$db->query('DROP TABLE IF EXISTS test_copy_to CASCADE');
 $db->exec('CREATE TABLE test_copy_to (a integer not null primary key, b text, c integer)');
 
 $db->beginTransaction();
@@ -80,6 +79,12 @@ if(isset($filename)) {
     @unlink($filename);
 }
 ?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->exec('DROP TABLE test_copy_to');
+?>
 --EXPECTF--
 Preparing test table for CopyTo tests
 Testing pgsqlCopyToArray() with default parameters
diff --git a/ext/pdo_pgsql/tests/is_in_transaction.phpt b/ext/pdo_pgsql/tests/is_in_transaction.phpt
index d5abd355d8bd7..8ff61ff1c8eab 100644
--- a/ext/pdo_pgsql/tests/is_in_transaction.phpt
+++ b/ext/pdo_pgsql/tests/is_in_transaction.phpt
@@ -16,7 +16,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
-$db->query('DROP TABLE IF EXISTS test_is_in_transaction CASCADE');
 $db->exec('CREATE TABLE test_is_in_transaction (a integer not null primary key, b text)');
 
 $db->beginTransaction();
@@ -56,7 +55,12 @@ var_dump($db->inTransaction());
     echo "Exception! at line ", $e->getLine(), "\n";
     var_dump($e->getMessage());
 }
-
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->exec('DROP TABLE test_is_in_transaction');
 ?>
 --EXPECT--
 Test PDO::PGSQL_TRANSACTION_INTRANS
diff --git a/ext/pdo_pgsql/tests/large_objects.phpt b/ext/pdo_pgsql/tests/large_objects.phpt
index f9b35e9761372..401f53da8c072 100644
--- a/ext/pdo_pgsql/tests/large_objects.phpt
+++ b/ext/pdo_pgsql/tests/large_objects.phpt
@@ -16,7 +16,6 @@ $db = PDOTest::test_factory(__DIR__ . '/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
-$db->query('DROP TABLE IF EXISTS test_large_objects CASCADE');
 $db->exec('CREATE TABLE test_large_objects (blobid integer not null primary key, bloboid OID)');
 
 $db->beginTransaction();
@@ -78,7 +77,12 @@ echo "Fetched!\n";
 /* Now to remove the large object from the database, so it doesn't
  * linger and clutter up the storage */
 $db->pgsqlLOBUnlink($oid);
-
+?>
+--CLEAN--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->exec('DROP TABLE test_large_objects');
 ?>
 --EXPECT--
 Fetching: