Skip to content

Commit 050c586

Browse files
iluuu1994iluuu1994
committed
Switch sqlite tests from " to ' for strings
This behavior is discouraged and seems to be disabled by default in new versions. https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted
1 parent c456b83 commit 050c586

22 files changed

+36
-40
lines changed

‎ext/pdo_sqlite/tests/bug38334.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ pdo_sqlite
77

88
$db = new PDO('sqlite::memory:');
99
$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")');
10+
$db->exec('INSERT INTO test_38334 VALUES (42, 46.7, \'test\')');
1111
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_38334 VALUES (10000000000, 0.0, "")');
14+
$db->exec('INSERT INTO test_38334 VALUES (10000000000, 0.0, \'\')');
1515
$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);
@@ -20,8 +20,8 @@ if (PHP_INT_SIZE >= 8) {
2020
}
2121

2222
// Check storing of strings into integer/float columns.
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));
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/bug_42589.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(!in_array('ENABLE_COLUMN_METADATA', $options, true))
1515
$db = new PDO("sqlite::memory:");
1616

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

2020
$result = $db->query('SELECT * FROM test_42589 t1 LEFT JOIN test_42589 t2 ON t1.field1 = t2.field1');
2121
$meta1 = $result->getColumnMeta(0);

‎ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $db = new PDO('sqlite::memory:');
99
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
1010

1111
$db->exec('CREATE TABLE test_fetch_func_001 (id INTEGER , name VARCHAR)');
12-
$db->exec('INSERT INTO test_fetch_func_001 VALUES(1, "php"), (2, "")');
12+
$db->exec('INSERT INTO test_fetch_func_001 VALUES(1, \'php\'), (2, \'\')');
1313

1414
$st = $db->query('SELECT * FROM test_fetch_func_001');
1515
$st->fetchAll(

‎ext/pdo_sqlite/tests/pdo_sqlite_createaggregate.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $db = new PDO('sqlite::memory:');
99

1010
$db->query('CREATE TABLE test_pdo_sqlite_createaggregate (id INT AUTO INCREMENT, name TEXT)');
1111

12-
$db->query('INSERT INTO test_pdo_sqlite_createaggregate VALUES (NULL, "PHP"), (NULL, "PHP6")');
12+
$db->query('INSERT INTO test_pdo_sqlite_createaggregate VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1313

1414
$db->sqliteCreateAggregate('testing', function(&$a, $b) { $a .= $b; return $a; }, function(&$v) { return $v; });
1515

‎ext/pdo_sqlite/tests/pdo_sqlite_createcollation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1010

1111
$db->query('CREATE TABLE test_pdo_sqlite_createcollation (id INT AUTO INCREMENT, name TEXT)');
1212

13-
$db->query('INSERT INTO test_pdo_sqlite_createcollation VALUES (NULL, "1"), (NULL, "2"), (NULL, "10")');
13+
$db->query('INSERT INTO test_pdo_sqlite_createcollation VALUES (NULL, \'1\'), (NULL, \'2\'), (NULL, \'10\')');
1414

1515
$db->sqliteCreateCollation('MYCOLLATE', function($a, $b) { return strnatcmp($a, $b); });
1616

‎ext/pdo_sqlite/tests/pdo_sqlite_createfunction.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $db = new PDO('sqlite::memory:');
99

1010
$db->query('CREATE TABLE test_pdo_sqlite_createfunction (id INT AUTO INCREMENT, name TEXT)');
1111

12-
$db->query('INSERT INTO test_pdo_sqlite_createfunction VALUES (NULL, "PHP"), (NULL, "PHP6")');
12+
$db->query('INSERT INTO test_pdo_sqlite_createfunction VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1313

1414

1515
$db->sqliteCreateFunction('testing', function($v) { return strtolower($v); });

‎ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $db = new PDO('sqlite::memory:');
1313

1414
$db->query('CREATE TABLE test_pdo_sqlite_createfunction_with_flags (id INT AUTO INCREMENT, name TEXT)');
1515

16-
$db->query('INSERT INTO test_pdo_sqlite_createfunction_with_flags VALUES (NULL, "PHP"), (NULL, "PHP6")');
16+
$db->query('INSERT INTO test_pdo_sqlite_createfunction_with_flags VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1717

1818

1919
$db->sqliteCreateFunction('testing', function($v) { return strtolower($v); }, 1, PDO::SQLITE_DETERMINISTIC);

‎ext/pdo_sqlite/tests/pdo_sqlite_lastinsertid.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pdo_sqlite
77

88
$db = new PDO('sqlite::memory:');
99
$db->query('CREATE TABLE test_pdo_sqlite_lastinsertid (id INT AUTO INCREMENT, name TEXT)');
10-
$db->query('INSERT INTO test_pdo_sqlite_lastinsertid VALUES (NULL, "PHP"), (NULL, "PHP6")');
10+
$db->query('INSERT INTO test_pdo_sqlite_lastinsertid VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1111
var_dump($db->query('SELECT * FROM test_pdo_sqlite_lastinsertid'));
1212
var_dump($db->errorInfo());
1313
var_dump($db->lastInsertId());

‎ext/pdo_sqlite/tests/pdo_sqlite_parser.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ foreach ($queries as $k => $query) {
3131
// One parameter
3232
$queries = [
3333
"SELECT * FROM {$table} WHERE '1' = ?",
34-
"SELECT * FROM {$table} WHERE \"?\" IN (?, \"?\")",
3534
"SELECT * FROM {$table} WHERE `a``?` = ?",
36-
"SELECT * FROM {$table} WHERE \"a`?\" = ?",
3735
"SELECT * FROM {$table} WHERE [a`?] = ?",
3836
];
3937

@@ -58,5 +56,3 @@ bool(true)
5856
bool(true)
5957
bool(true)
6058
bool(true)
61-
bool(true)
62-
bool(true)

‎ext/pdo_sqlite/tests/pdo_sqlite_transaction.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $db->query('CREATE TABLE test_pdo_sqlite_transaction (id INT AUTO INCREMENT, nam
1414
$db->commit();
1515

1616
$db->beginTransaction();
17-
$db->query('INSERT INTO test_pdo_sqlite_transaction VALUES (NULL, "PHP"), (NULL, "PHP6")');
17+
$db->query('INSERT INTO test_pdo_sqlite_transaction VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1818
$db->rollback();
1919

2020
$r = $db->query('SELECT COUNT(*) FROM test_pdo_sqlite_transaction');

‎ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createafunction_trampoline.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class TrampolineTest {
2020

2121
var_dump($db->createFunction('strtoupper', [new TrampolineTest(), 'strtoupper']));
2222

23-
foreach ($db->query('SELECT strtoupper("test")') as $row) {
23+
foreach ($db->query('SELECT strtoupper(\'test\')') as $row) {
2424
var_dump($row);
2525
}
2626

27-
foreach ($db->query('SELECT strtoupper("test")') as $row) {
27+
foreach ($db->query('SELECT strtoupper(\'test\')') as $row) {
2828
var_dump($row);
2929
}
3030

@@ -33,14 +33,14 @@ foreach ($db->query('SELECT strtoupper("test")') as $row) {
3333
bool(true)
3434
Trampoline for strtoupper
3535
array(2) {
36-
["strtoupper("test")"]=>
36+
["strtoupper('test')"]=>
3737
string(4) "TEST"
3838
[0]=>
3939
string(4) "TEST"
4040
}
4141
Trampoline for strtoupper
4242
array(2) {
43-
["strtoupper("test")"]=>
43+
["strtoupper('test')"]=>
4444
string(4) "TEST"
4545
[0]=>
4646
string(4) "TEST"

‎ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createaggregate.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $db = new Pdo\Sqlite('sqlite::memory:');
1010

1111
$db->query('CREATE TABLE test_pdo_sqlite_createaggregate (id INT AUTO INCREMENT, name TEXT)');
1212

13-
$db->query('INSERT INTO test_pdo_sqlite_createaggregate VALUES (NULL, "PHP"), (NULL, "PHP6")');
13+
$db->query('INSERT INTO test_pdo_sqlite_createaggregate VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1414

1515
$db->createAggregate('testing', function(&$a, $b) { $a .= $b; return $a; }, function(&$v) { return $v; });
1616

‎ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createcollation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1111

1212
$db->query('CREATE TABLE test_pdo_sqlite_createcollation (id INT AUTO INCREMENT, name TEXT)');
1313

14-
$db->query('INSERT INTO test_pdo_sqlite_createcollation VALUES (NULL, "1"), (NULL, "2"), (NULL, "10")');
14+
$db->query('INSERT INTO test_pdo_sqlite_createcollation VALUES (NULL, \'1\'), (NULL, \'2\'), (NULL, \'10\')');
1515

1616
$db->createCollation('MYCOLLATE', function($a, $b) { return strnatcmp($a, $b); });
1717

‎ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createcollation_trampoline.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $db = new Pdo\Sqlite('sqlite::memory:');
99

1010
$db->query('CREATE TABLE test_pdo_sqlite_createcollation_trampoline (s VARCHAR(4))');
1111

12-
$stmt = $db->query('INSERT INTO test_pdo_sqlite_createcollation_trampoline VALUES ("a1"), ("a10"), ("a2")');
12+
$stmt = $db->query('INSERT INTO test_pdo_sqlite_createcollation_trampoline VALUES (\'a1\'), (\'a10\'), (\'a2\')');
1313

1414
class TrampolineTest {
1515
public function __call(string $name, array $arguments) {

‎ext/pdo_sqlite/tests/subclasses/pdo_sqlite_createfunction_with_flags.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if (!defined('PDO::SQLITE_DETERMINISTIC')) die('skip system sqlite is too old');
1111
// This test was copied from the pdo_sqlite test for sqliteCreateCollation
1212
$db = new Pdo\Sqlite('sqlite::memory:');
1313
$db->query('CREATE TABLE test_pdo_sqlite_createfunction_with_flags (id INT AUTO INCREMENT, name TEXT)');
14-
$db->query('INSERT INTO test_pdo_sqlite_createfunction_with_flags VALUES (NULL, "PHP"), (NULL, "PHP6")');
14+
$db->query('INSERT INTO test_pdo_sqlite_createfunction_with_flags VALUES (NULL, \'PHP\'), (NULL, \'PHP6\')');
1515

1616
$db->createFunction('testing', function($v) { return strtolower($v); }, 1, Pdo\Sqlite::DETERMINISTIC);
1717

‎ext/pdo_sqlite/tests/subclasses/pdosqlite_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ $db = new Pdo\Sqlite('sqlite::memory:');
99

1010
$db->query('CREATE TABLE pdosqlite_001 (id INT AUTO INCREMENT, name TEXT)');
1111

12-
$db->query('INSERT INTO pdosqlite_001 VALUES (NULL, "PHP")');
13-
$db->query('INSERT INTO pdosqlite_001 VALUES (NULL, "PHP6")');
12+
$db->query('INSERT INTO pdosqlite_001 VALUES (NULL, \'PHP\')');
13+
$db->query('INSERT INTO pdosqlite_001 VALUES (NULL, \'PHP6\')');
1414

1515
$db->createFunction('testing', function($v) { return strtolower($v); }, 1, Pdo\Sqlite::DETERMINISTIC);
1616

‎ext/pdo_sqlite/tests/subclasses/pdosqlite_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (!$db instanceof Pdo\Sqlite) {
1111
}
1212

1313
$db->query('CREATE TABLE pdosqlite_002 (id INT AUTO INCREMENT, name TEXT)');
14-
$db->query('INSERT INTO pdosqlite_002 VALUES (NULL, "PHP")');
15-
$db->query('INSERT INTO pdosqlite_002 VALUES (NULL, "PHP6")');
14+
$db->query('INSERT INTO pdosqlite_002 VALUES (NULL, \'PHP\')');
15+
$db->query('INSERT INTO pdosqlite_002 VALUES (NULL, \'PHP6\')');
1616

1717
$db->createFunction('testing', function($v) { return strtolower($v); }, 1, Pdo\Sqlite::DETERMINISTIC);
1818

‎ext/sqlite3/tests/bug72668.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ $db = new SQLite3(':memory:');
1212
$db->createFunction('my_udf_md5', 'my_udf_md5');
1313

1414
try {
15-
$result = $db->query('SELECT my_udf_md5("test")');
15+
$result = $db->query('SELECT my_udf_md5(\'test\')');
1616
var_dump($result);
1717
}
1818
catch(\Exception $e) {
1919
echo "Exception: ".$e->getMessage();
2020
}
2121
try {
22-
$result = $db->querySingle('SELECT my_udf_md5("test")');
22+
$result = $db->querySingle('SELECT my_udf_md5(\'test\')');
2323
var_dump($result);
2424
}
2525
catch(\Exception $e) {
2626
echo "Exception: ".$e->getMessage();
2727
}
28-
$statement = $db->prepare('SELECT my_udf_md5("test")');
28+
$statement = $db->prepare('SELECT my_udf_md5(\'test\')');
2929
try {
3030
$result = $statement->execute();
3131
var_dump($result);

‎ext/sqlite3/tests/sqlite3_29_createfunction.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ require_once(__DIR__ . '/new_db.inc');
99

1010
$func = 'strtoupper';
1111
var_dump($db->createfunction($func, $func));
12-
var_dump($db->querySingle('SELECT strtoupper("test")'));
12+
var_dump($db->querySingle('SELECT strtoupper(\'test\')'));
1313

1414
$func2 = 'strtolower';
1515
var_dump($db->createfunction($func2, $func2));
16-
var_dump($db->querySingle('SELECT strtolower("TEST")'));
16+
var_dump($db->querySingle('SELECT strtolower(\'TEST\')'));
1717

1818
var_dump($db->createfunction($func, $func2));
19-
var_dump($db->querySingle('SELECT strtoupper("tEst")'));
19+
var_dump($db->querySingle('SELECT strtoupper(\'tEst\')'));
2020

2121

2222
?>

‎ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ require_once(__DIR__ . '/new_db.inc');
1313

1414
$func = 'strtoupper';
1515
var_dump($db->createfunction($func, $func, 1, SQLITE3_DETERMINISTIC));
16-
var_dump($db->querySingle('SELECT strtoupper("test")'));
16+
var_dump($db->querySingle('SELECT strtoupper(\'test\')'));
1717

1818
$func2 = 'strtolower';
1919
var_dump($db->createfunction($func2, $func2, 1, SQLITE3_DETERMINISTIC));
20-
var_dump($db->querySingle('SELECT strtolower("TEST")'));
20+
var_dump($db->querySingle('SELECT strtolower(\'TEST\')'));
2121

2222
var_dump($db->createfunction($func, $func2, 1, SQLITE3_DETERMINISTIC));
23-
var_dump($db->querySingle('SELECT strtoupper("tEst")'));
23+
var_dump($db->querySingle('SELECT strtoupper(\'tEst\')'));
2424

2525

2626
?>

‎ext/sqlite3/tests/sqlite3_rename_column.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (SQLite3::version()['versionNumber'] < 3025000) {
1414
$db = new SQLite3(':memory:');
1515

1616
$db->exec('CREATE TABLE tbl (orig text)');
17-
$db->exec('insert into tbl values ("one"), ("two")');
17+
$db->exec('insert into tbl values (\'one\'), (\'two\')');
1818

1919
$res1 = $db->prepare('select * from tbl')->execute();
2020
$res2 = $db->prepare('select * from tbl')->execute();

‎ext/sqlite3/tests/sqlite3_trampoline_createfunction.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class TrampolineTest {
1616
$o = new TrampolineTest();
1717
$callback = [$o, 'strtoupper'];
1818
var_dump($db->createfunction('strtoupper', $callback));
19-
var_dump($db->querySingle('SELECT strtoupper("test")'));
20-
var_dump($db->querySingle('SELECT strtoupper("test")'));
19+
var_dump($db->querySingle('SELECT strtoupper(\'test\')'));
20+
var_dump($db->querySingle('SELECT strtoupper(\'test\')'));
2121

2222
?>
2323
--EXPECT--

0 commit comments

Comments
 (0)