Skip to content

Commit 417f3fd

Browse files
alexandre-dauboisalexandre-daubois
authored
Improve ext/pdo_sqlite tests cleanup (php#11900)
1 parent b275e13 commit 417f3fd

12 files changed

+56
-50
lines changed

‎ext/pdo_sqlite/tests/bug33841.phpt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,24 @@ pdo_sqlite
77
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
88
$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
99

10-
$db->exec('CREATE TABLE test (text)');
10+
$db->exec('CREATE TABLE test_33841 (text)');
1111

12-
$stmt = $db->prepare("INSERT INTO test VALUES ( :text )");
12+
$stmt = $db->prepare("INSERT INTO test_33841 VALUES ( :text )");
1313
$stmt->bindParam(':text', $name);
1414
$name = 'test1';
1515
var_dump($stmt->execute(), $stmt->rowCount());
1616

17-
$stmt = $db->prepare("UPDATE test SET text = :text ");
17+
$stmt = $db->prepare("UPDATE test_33841 SET text = :text ");
1818
$stmt->bindParam(':text', $name);
1919
$name = 'test2';
2020
var_dump($stmt->execute(), $stmt->rowCount());
2121
?>
22+
--CLEAN--
23+
<?php
24+
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
25+
$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
26+
$db->exec('DROP TABLE IF EXISTS test_33841');
27+
?>
2228
--EXPECT--
2329
bool(true)
2430
int(1)

‎ext/pdo_sqlite/tests/bug35336.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ class EEE {
1111
}
1212

1313
$a = new PDO("sqlite::memory:");// pool ("sqlite::memory:");
14-
$a->query ("CREATE TABLE test (a integer primary key, b text)");
15-
$b = $a->prepare("insert into test (b) values (?)");
14+
$a->query ("CREATE TABLE test_35336 (a integer primary key, b text)");
15+
$b = $a->prepare("insert into test_35336 (b) values (?)");
1616
$b->execute(array (5));
17-
$rez = $a->query ("SELECT * FROM test")->fetchAll(PDO::FETCH_CLASS, 'EEE');
17+
$rez = $a->query ("SELECT * FROM test_35336")->fetchAll(PDO::FETCH_CLASS, 'EEE');
1818

1919
echo "Done\n";
2020
?>

‎ext/pdo_sqlite/tests/bug38334.phpt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ pdo_sqlite
66
<?php
77

88
$db = new PDO('sqlite::memory:');
9-
$db->exec('CREATE TABLE test (i INTEGER , f DOUBLE, s VARCHAR(255))');
10-
$db->exec('INSERT INTO test VALUES (42, 46.7, "test")');
11-
var_dump($db->query('SELECT * FROM test')->fetch(PDO::FETCH_ASSOC));
9+
$db->exec('CREATE TABLE test_38334 (i INTEGER , f DOUBLE, s VARCHAR(255))');
10+
$db->exec('INSERT INTO test_38334 VALUES (42, 46.7, "test")');
11+
var_dump($db->query('SELECT * FROM test_38334')->fetch(PDO::FETCH_ASSOC));
1212

1313
// Check handling of integers larger than 32-bit.
14-
$db->exec('INSERT INTO test VALUES (10000000000, 0.0, "")');
15-
$i = $db->query('SELECT i FROM test WHERE f = 0.0')->fetchColumn(0);
14+
$db->exec('INSERT INTO test_38334 VALUES (10000000000, 0.0, "")');
15+
$i = $db->query('SELECT i FROM test_38334 WHERE f = 0.0')->fetchColumn(0);
1616
if (PHP_INT_SIZE >= 8) {
1717
var_dump($i === 10000000000);
1818
} else {
1919
var_dump($i === '10000000000');
2020
}
2121

2222
// Check storing of strings into integer/float columns.
23-
$db->exec('INSERT INTO test VALUES ("test", "test", "x")');
24-
var_dump($db->query('SELECT * FROM test WHERE s = "x"')->fetch(PDO::FETCH_ASSOC));
23+
$db->exec('INSERT INTO test_38334 VALUES ("test", "test", "x")');
24+
var_dump($db->query('SELECT * FROM test_38334 WHERE s = "x"')->fetch(PDO::FETCH_ASSOC));
2525

2626
?>
2727
--EXPECT--

‎ext/pdo_sqlite/tests/bug70862.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pdo_sqlite
88
$db = new PDO('sqlite::memory:');
99
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1010

11-
$db->exec('CREATE TABLE test(field BLOB)');
11+
$db->exec('CREATE TABLE test_70862(field BLOB)');
1212

1313
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
1414
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
@@ -24,7 +24,7 @@ stream_wrapper_register("hello", "HelloWrapper");
2424

2525
$f = fopen("hello://there", "r");
2626

27-
$stmt = $db->prepare('INSERT INTO test(field) VALUES (:para)');
27+
$stmt = $db->prepare('INSERT INTO test_70862(field) VALUES (:para)');
2828
$stmt->bindParam(":para", $f, PDO::PARAM_LOB);
2929
$stmt->execute();
3030

‎ext/pdo_sqlite/tests/bug_42589.phpt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ if(!in_array('ENABLE_COLUMN_METADATA', $options, true))
1414
<?php
1515
$db = new PDO("sqlite::memory:");
1616

17-
$db->exec('CREATE TABLE test (field1 VARCHAR(10))');
18-
$db->exec('INSERT INTO test VALUES("test")');
17+
$db->exec('CREATE TABLE test_42589 (field1 VARCHAR(10))');
18+
$db->exec('INSERT INTO test_42589 VALUES("test")');
1919

20-
$result = $db->query('SELECT * FROM test t1 LEFT JOIN test t2 ON t1.field1 = t2.field1');
20+
$result = $db->query('SELECT * FROM test_42589 t1 LEFT JOIN test_42589 t2 ON t1.field1 = t2.field1');
2121
$meta1 = $result->getColumnMeta(0);
2222
$meta2 = $result->getColumnMeta(1);
2323

24-
var_dump(!empty($meta1['table']) && $meta1['table'] == 'test');
25-
var_dump(!empty($meta2['table']) && $meta2['table'] == 'test');
24+
var_dump(!empty($meta1['table']) && $meta1['table'] == 'test_42589');
25+
var_dump(!empty($meta2['table']) && $meta2['table'] == 'test_42589');
2626
?>
2727
--EXPECT--
2828
bool(true)

‎ext/pdo_sqlite/tests/pdo_035.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ pdo_sqlite
55
--FILE--
66
<?php
77
$db = new PDO('sqlite::memory:');
8-
$db->exec('CREATE TABLE test (id int)');
9-
$db->exec('INSERT INTO test VALUES (23)');
8+
$db->exec('CREATE TABLE test_pdo_035 (id int)');
9+
$db->exec('INSERT INTO test_pdo_035 VALUES (23)');
1010

11-
$stmt = $db->prepare('SELECT id FROM test');
11+
$stmt = $db->prepare('SELECT id FROM test_pdo_035');
1212
$stmt->execute();
1313
$result = $stmt->fetch(PDO::FETCH_LAZY);
1414

‎ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,46 @@ pdo_sqlite
88
$db = new PDO('sqlite::memory:');
99
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
1010

11-
$db->exec('CREATE TABLE testing (id INTEGER , name VARCHAR)');
12-
$db->exec('INSERT INTO testing VALUES(1, "php")');
13-
$db->exec('INSERT INTO testing VALUES(2, "")');
11+
$db->exec('CREATE TABLE test_fetch_func_001 (id INTEGER , name VARCHAR)');
12+
$db->exec('INSERT INTO test_fetch_func_001 VALUES(1, "php")');
13+
$db->exec('INSERT INTO test_fetch_func_001 VALUES(2, "")');
1414

15-
$st = $db->query('SELECT * FROM testing');
15+
$st = $db->query('SELECT * FROM test_fetch_func_001');
1616
$st->fetchAll(PDO::FETCH_FUNC, function($x, $y) use ($st) { var_dump($st); print "data: $x, $y\n"; });
1717

18-
$st = $db->query('SELECT name FROM testing');
18+
$st = $db->query('SELECT name FROM test_fetch_func_001');
1919
var_dump($st->fetchAll(PDO::FETCH_FUNC, 'strtoupper'));
2020

2121
try {
22-
$st = $db->query('SELECT * FROM testing');
22+
$st = $db->query('SELECT * FROM test_fetch_func_001');
2323
var_dump($st->fetchAll(PDO::FETCH_FUNC, 'nothing'));
2424
} catch (\TypeError $e) {
2525
echo $e->getMessage(), \PHP_EOL;
2626
}
2727

2828
try {
29-
$st = $db->query('SELECT * FROM testing');
29+
$st = $db->query('SELECT * FROM test_fetch_func_001');
3030
var_dump($st->fetchAll(PDO::FETCH_FUNC, ''));
3131
} catch (\TypeError $e) {
3232
echo $e->getMessage(), \PHP_EOL;
3333
}
3434

3535
try {
36-
$st = $db->query('SELECT * FROM testing');
36+
$st = $db->query('SELECT * FROM test_fetch_func_001');
3737
var_dump($st->fetchAll(PDO::FETCH_FUNC, NULL));
3838
} catch (\TypeError $e) {
3939
echo $e->getMessage(), \PHP_EOL;
4040
}
4141

4242
try {
43-
$st = $db->query('SELECT * FROM testing');
43+
$st = $db->query('SELECT * FROM test_fetch_func_001');
4444
var_dump($st->fetchAll(PDO::FETCH_FUNC, 1));
4545
} catch (\TypeError $e) {
4646
echo $e->getMessage(), \PHP_EOL;
4747
}
4848

4949
try {
50-
$st = $db->query('SELECT * FROM testing');
50+
$st = $db->query('SELECT * FROM test_fetch_func_001');
5151
var_dump($st->fetchAll(PDO::FETCH_FUNC, array('self', 'foo')));
5252
} catch (\TypeError $e) {
5353
echo $e->getMessage(), \PHP_EOL;
@@ -60,7 +60,7 @@ class foo {
6060
}
6161
class bar extends foo {
6262
public function __construct($db) {
63-
$st = $db->query('SELECT * FROM testing');
63+
$st = $db->query('SELECT * FROM test_fetch_func_001');
6464
var_dump($st->fetchAll(PDO::FETCH_FUNC, array($this, 'parent::method')));
6565
}
6666

@@ -79,25 +79,25 @@ class bar extends foo {
7979

8080
new bar($db);
8181

82-
$st = $db->query('SELECT * FROM testing');
82+
$st = $db->query('SELECT * FROM test_fetch_func_001');
8383
var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'test')));
8484

8585
try {
86-
$st = $db->query('SELECT * FROM testing');
86+
$st = $db->query('SELECT * FROM test_fetch_func_001');
8787
var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'test2')));
8888
} catch (\TypeError $e) {
8989
echo $e->getMessage(), \PHP_EOL;
9090
}
9191

9292
try {
93-
$st = $db->query('SELECT * FROM testing');
93+
$st = $db->query('SELECT * FROM test_fetch_func_001');
9494
var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'test3')));
9595
} catch (\TypeError $e) {
9696
echo $e->getMessage(), \PHP_EOL;
9797
}
9898

9999
try {
100-
$st = $db->query('SELECT * FROM testing');
100+
$st = $db->query('SELECT * FROM test_fetch_func_001');
101101
var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'inexistent')));
102102
} catch (\TypeError $e) {
103103
echo $e->getMessage(), \PHP_EOL;
@@ -107,12 +107,12 @@ try {
107107
--EXPECTF--
108108
object(PDOStatement)#%d (1) {
109109
["queryString"]=>
110-
string(21) "SELECT * FROM testing"
110+
string(33) "SELECT * FROM test_fetch_func_001"
111111
}
112112
data: 1, php
113113
object(PDOStatement)#%d (1) {
114114
["queryString"]=>
115-
string(21) "SELECT * FROM testing"
115+
string(33) "SELECT * FROM test_fetch_func_001"
116116
}
117117
data: 2,
118118
array(2) {

‎ext/pdo_sqlite/tests/pdo_sqlite_empty_filename.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ pdo_sqlite
88
// create with empty filename
99
$db = new PDO('sqlite:');
1010

11-
var_dump($db->exec('CREATE TABLE test1 (id INT);'));
11+
var_dump($db->exec('CREATE TABLE test_sqlite_empty_filename (id INT);'));
1212

1313
// create with empty URI
1414
$db = new PDO('sqlite:file:?cache=shared');
1515

16-
var_dump($db->exec('CREATE TABLE test1 (id INT);'));
16+
var_dump($db->exec('CREATE TABLE test_sqlite_empty_filename (id INT);'));
1717
?>
1818
--EXPECT--
1919
int(0)

‎ext/pdo_sqlite/tests/pdo_sqlite_filename_uri.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ pdo_sqlite
88
// create with in-memory database using shared cached
99
$db = new PDO('sqlite:file::memory:?cache=shared');
1010

11-
var_dump($db->exec('CREATE TABLE test1 (id INT);'));
11+
var_dump($db->exec('CREATE TABLE test_sqlite_filename_uri (id INT);'));
1212

1313
// create second connection to in-memory database
1414
$db = new PDO('sqlite:file::memory:?cache=shared');
1515

16-
var_dump($db->exec('SELECT * from test1'));
16+
var_dump($db->exec('SELECT * from test_sqlite_filename_uri'));
1717

1818
// create with default read-write|create mode
1919
$filename = "file:" . __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite_filename_uri.db";
2020

2121
$db = new PDO('sqlite:' . $filename);
2222

23-
var_dump($db->exec('CREATE TABLE test1 (id INT);'));
23+
var_dump($db->exec('CREATE TABLE test_sqlite_filename_uri (id INT);'));
2424

2525
// create with readonly mode
2626
$filename = "file:" . __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite_filename_uri.db?mode=ro";
2727

2828
$db = new PDO('sqlite:' . $filename);
2929

30-
var_dump($db->exec('CREATE TABLE test2 (id INT);'));
30+
var_dump($db->exec('CREATE TABLE test_sqlite_filename_uri_2 (id INT);'));
3131

3232
?>
3333
--CLEAN--

‎ext/pdo_sqlite/tests/pdo_sqlite_open_basedir.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $filename = 'pdo_sqlite_filename.db';
1212

1313
$db = new PDO('sqlite:' . $filename);
1414

15-
var_dump($db->exec('CREATE TABLE test1 (id INT);'));
15+
var_dump($db->exec('CREATE TABLE test_sqlite_open_basedir (id INT);'));
1616

1717
// create outside basedir
1818
$filename = '..' . DIRECTORY_SEPARATOR . 'pdo_sqlite_filename.db';

0 commit comments

Comments
 (0)