Skip to content

Commit fbc9c85

Browse files
kocsismatekocsismate
committed
Fix tests
1 parent 25820bb commit fbc9c85

24 files changed

+75
-28
lines changed

‎ext/pdo/tests/bug_36798.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ PDOTest::dropTableIfExists($db, "test36798");
4545
--EXPECT--
4646
array(1) {
4747
[0]=>
48-
string(1) "�"
48+
string(2) "Ã"
4949
}

‎ext/pdo/tests/pdo_002.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test002(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test002 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
19+
$db->exec("INSERT INTO test002 VALUES(1, 'A')");
20+
$db->exec("INSERT INTO test002 VALUES(2, 'B')");
21+
$db->exec("INSERT INTO test002 VALUES(3, 'C')");
2022

2123
$stmt = $db->prepare('SELECT * from test002');
2224
$stmt->execute();

‎ext/pdo/tests/pdo_003.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test003(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test003 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
19+
$db->exec("INSERT INTO test003 VALUES(1, 'A')");
20+
$db->exec("INSERT INTO test003 VALUES(2, 'B')");
21+
$db->exec("INSERT INTO test003 VALUES(3, 'C')");
2022

2123
$stmt = $db->prepare('SELECT * from test003');
2224
$stmt->execute();

‎ext/pdo/tests/pdo_004.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test004(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test004 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
19+
$db->exec("INSERT INTO test004 VALUES(1, 'A')");
20+
$db->exec("INSERT INTO test004 VALUES(2, 'B')");
21+
$db->exec("INSERT INTO test004 VALUES(3, 'C')");
2022

2123
$stmt = $db->prepare('SELECT * from test004');
2224
$stmt->execute();

‎ext/pdo/tests/pdo_005.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test005(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
19-
$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA'), (2, 'B', 'BB'), (3, 'C', 'CC')");
19+
$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA')");
20+
$db->exec("INSERT INTO test005 VALUES(2, 'B', 'BB')");
21+
$db->exec("INSERT INTO test005 VALUES(3, 'C', 'CC')");
2022

2123
$stmt = $db->prepare('SELECT id, val, val2 from test005');
2224

‎ext/pdo/tests/pdo_006.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test006(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test006 VALUES(1, 'A'), (2, 'A'), (3, 'C')");
19+
$db->exec("INSERT INTO test006 VALUES(1, 'A')");
20+
$db->exec("INSERT INTO test006 VALUES(2, 'A')");
21+
$db->exec("INSERT INTO test006 VALUES(3, 'C')");
2022

2123
$stmt = $db->prepare('SELECT val, id from test006');
2224

‎ext/pdo/tests/pdo_007.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test007(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test007 VALUES('A', 'A'), ('B', 'A'), ('C', 'C')");
19+
$db->exec("INSERT INTO test007 VALUES('A', 'A')");
20+
$db->exec("INSERT INTO test007 VALUES('B', 'A')");
21+
$db->exec("INSERT INTO test007 VALUES('C', 'C')");
2022

2123
$stmt = $db->prepare('SELECT id, val from test007');
2224

‎ext/pdo/tests/pdo_009.phpt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE classtypes009(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
19-
$db->exec("INSERT INTO classtypes009 VALUES(0, 'stdClass'), (1, 'Test1'), (2, 'Test2')");
19+
$db->exec("INSERT INTO classtypes009 VALUES(0, 'stdClass')");
20+
$db->exec("INSERT INTO classtypes009 VALUES(1, 'Test1')");
21+
$db->exec("INSERT INTO classtypes009 VALUES(2, 'Test2')");
2022
$db->exec('CREATE TABLE test009(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))');
21-
$db->exec("INSERT INTO test009 VALUES(1, 0, 'A'), (2, 1, 'B'), (3, 2, 'C'), (4, 3, 'D')");
23+
$db->exec("INSERT INTO test009 VALUES(1, 0, 'A')");
24+
$db->exec("INSERT INTO test009 VALUES(2, 1, 'B')");
25+
$db->exec("INSERT INTO test009 VALUES(3, 2, 'C')");
26+
$db->exec("INSERT INTO test009 VALUES(4, 3, 'D')");
2227

23-
$stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test009 LEFT JOIN classtypes009 ON test.classtype=classtypes.id');
28+
$stmt = $db->prepare('SELECT classtypes009.name, classtypes009.id AS id, test009.val AS val FROM test009 LEFT JOIN classtypes009 ON test009.classtype=classtypes009.id');
2429

2530
class Test1
2631
{

‎ext/pdo/tests/pdo_010.phpt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE classtypes010(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
19-
$db->exec("INSERT INTO classtypes010 VALUES(0, 'stdClass'), (1, 'Test1'), (2, 'Test2'));
19+
$db->exec("INSERT INTO classtypes010 VALUES(0, 'stdClass')");
20+
$db->exec("INSERT INTO classtypes010 VALUES(1, 'Test1')");
21+
$db->exec("INSERT INTO classtypes010 VALUES(2, 'Test2')");
2022
$db->exec('CREATE TABLE test010(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))');
21-
$db->exec("INSERT INTO test010 VALUES(1, 0, 'A', 'Group1'), (2, 1, 'B', 'Group1'), (3, 2, 'C', 'Group2'), (4, 3, 'D', 'Group2')");
23+
$db->exec("INSERT INTO test010 VALUES(1, 0, 'A', 'Group1')");
24+
$db->exec("INSERT INTO test010 VALUES(2, 1, 'B', 'Group1')");
25+
$db->exec("INSERT INTO test010 VALUES(3, 2, 'C', 'Group2')");
26+
$db->exec("INSERT INTO test010 VALUES(4, 3, 'D', 'Group2')");
2227

23-
$stmt = $db->prepare('SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test010 LEFT JOIN classtypes010 ON test.classtype=classtypes.id');
28+
$stmt = $db->prepare('SELECT classtypes010.name, test010.grp AS grp, test010.id AS id, test010.val AS val FROM test010 LEFT JOIN classtypes010 ON test010.classtype=classtypes010.id');
2429

2530
class Test1
2631
{

‎ext/pdo/tests/pdo_011.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test011(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
19-
$db->exec("INSERT INTO test011 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group1'), (3, 'C', 'Group2'), (4, 'D', 'Group2')");
19+
$db->exec("INSERT INTO test011 VALUES(1, 'A', 'Group1')");
20+
$db->exec("INSERT INTO test011 VALUES(2, 'B', 'Group1')");
21+
$db->exec("INSERT INTO test011 VALUES(3, 'C', 'Group2')");
22+
$db->exec("INSERT INTO test011 VALUES(4, 'D', 'Group2')");
2023

2124
class DerivedStatement extends PDOStatement
2225
{

‎ext/pdo/tests/pdo_012.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test012(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
19-
$db->exec("INSERT INTO test012 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
19+
$db->exec("INSERT INTO test012 VALUES(1, 'A', 'Group1')");
20+
$db->exec("INSERT INTO test012 VALUES(2, 'B', 'Group2')");
2021

2122
$SELECT = 'SELECT val, grp FROM test012';
2223

‎ext/pdo/tests/pdo_013.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test013(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
19-
$db->exec("INSERT INTO test013 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
19+
$db->exec("INSERT INTO test013 VALUES(1, 'A', 'Group1')");
20+
$db->exec("INSERT INTO test013 VALUES(2, 'B', 'Group2')");
2021

2122
$SELECT = 'SELECT val, grp FROM test013';
2223

‎ext/pdo/tests/pdo_014.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test014(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
19-
$db->exec("INSERT INTO test014 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
19+
$db->exec("INSERT INTO test014 VALUES(1, 'A', 'Group1')");
20+
$db->exec("INSERT INTO test014 VALUES(2, 'B', 'Group2')");
2021
$SELECT = 'SELECT val, grp FROM test014';
2122

2223
class Test

‎ext/pdo/tests/pdo_015.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test015(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))');
19-
$db->exec("INSERT INTO test015 VALUES(1, 'A', 'A2'), (2, 'A', 'B2')");
19+
$db->exec("INSERT INTO test015 VALUES(1, 'A', 'A2')");
20+
$db->exec("INSERT INTO test015 VALUES(2, 'A', 'B2')");
2021

2122
$select1 = $db->prepare('SELECT id, val, val2 FROM test015');
2223
$select2 = $db->prepare('SELECT val, val2 FROM test015');

‎ext/pdo/tests/pdo_016.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
2121
}
2222

2323
$db->exec('CREATE TABLE test016(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
24-
$db->exec("INSERT INTO test016 VALUES(0, 'String0'), (1, 'String1'), (2, 'String2')");
24+
$db->exec("INSERT INTO test016 VALUES(0, 'String0')");
25+
$db->exec("INSERT INTO test016 VALUES(1, 'String1')");
26+
$db->exec("INSERT INTO test016 VALUES(2, 'String2')");
2527

2628
$stmt1 = $db->prepare('SELECT COUNT(idx) FROM test016');
2729
$stmt2 = $db->prepare('SELECT idx, txt FROM test016 ORDER by idx');

‎ext/pdo/tests/pdo_016a.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
2121
}
2222

2323
$db->exec('CREATE TABLE test016a(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
24-
$db->exec("INSERT INTO test016a VALUES(0, 'String0'), (1, 'String1'), (2, 'String2')");
24+
$db->exec("INSERT INTO test016a VALUES(0, 'String0')");
25+
$db->exec("INSERT INTO test016a VALUES(1, 'String1')");
26+
$db->exec("INSERT INTO test016a VALUES(2, 'String2')");
2527

2628
$stmt1 = $db->prepare('SELECT COUNT(idx) FROM test016a');
2729
$stmt2 = $db->prepare('SELECT idx, txt FROM test016a ORDER by idx');

‎ext/pdo/tests/pdo_017.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
3737
}
3838

3939
$db->exec('CREATE TABLE test017(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))'.$suf);
40-
$db->exec("INSERT INTO test017 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
40+
$db->exec("INSERT INTO test017 VALUES(1, 'A')");
41+
$db->exec("INSERT INTO test017 VALUES(2, 'B')");
42+
$db->exec("INSERT INTO test017 VALUES(3, 'C')");
4143
$delete = $db->prepare('DELETE FROM test017');
4244

4345
function countRows($action) {

‎ext/pdo/tests/pdo_018.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ class TestLeaf extends TestDerived
6868
}
6969

7070
$db->exec('CREATE TABLE classtypes018(id int NOT NULL PRIMARY KEY, name VARCHAR(20) NOT NULL UNIQUE)');
71-
$db->exec("INSERT INTO classtypes018 VALUES(0, 'stdClass'), (1, 'TestBase'), (2, 'TestDerived')");
71+
$db->exec("INSERT INTO classtypes018 VALUES(0, 'stdClass')");
72+
$db->exec("INSERT INTO classtypes018 VALUES(1, 'TestBase')");
73+
$db->exec("INSERT INTO classtypes018 VALUES(2, 'TestDerived')");
7274

7375
switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
7476
case 'dblib':

‎ext/pdo/tests/pdo_019.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test019(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
19-
$db->exec("INSERT INTO test019 VALUES(0, 'String0'), (1, 'String1'), (2, 'String2'), (3, 'String3')");
19+
$db->exec("INSERT INTO test019 VALUES(0, 'String0')");
20+
$db->exec("INSERT INTO test019 VALUES(1, 'String1')");
21+
$db->exec("INSERT INTO test019 VALUES(2, 'String2')");
22+
$db->exec("INSERT INTO test019 VALUES(3, 'String3')");
2023

2124

2225
var_dump($db->query('SELECT COUNT(*) FROM test019')->fetchColumn());

‎ext/pdo/tests/pdo_020.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test020(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
19-
$db->exec("INSERT INTO test020 VALUES(1, 'A', 'A'), (2, 'B', 'B'), (3, 'C', 'C')");
19+
$db->exec("INSERT INTO test020 VALUES(1, 'A', 'A')");
20+
$db->exec("INSERT INTO test020 VALUES(2, 'B', 'B')");
21+
$db->exec("INSERT INTO test020 VALUES(3, 'C', 'C')");
2022

2123
foreach (array('SELECT id, val FROM test020', 'SELECT id, val, val2 FROM test020', 'SELECT COUNT(*) FROM test020') as $sql) {
2224

‎ext/pdo/tests/pdo_023.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ $db->test();
6464
var_dump($db);
6565

6666
$db->query('CREATE TABLE test023(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))');
67-
$db->query("INSERT INTO test023 VALUES(0, 'A'), (1, 'B')");
67+
$db->query("INSERT INTO test023 VALUES(0, 'A')");
68+
$db->query("INSERT INTO test023 VALUES(1, 'B')");
6869

6970

7071
$stmt = $db->query('SELECT val, id FROM test023');

‎ext/pdo/tests/pdo_027.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('create table test027 (id int, name varchar(10))');
19-
$db->exec("INSERT INTO test027 (id,name) VALUES(1,'test1'), (2,'test2')");
19+
$db->exec("INSERT INTO test027 (id,name) VALUES(1,'test1')");
20+
$db->exec("INSERT INTO test027 (id,name) VALUES(2,'test2')");
2021

2122
foreach ($db->query("SELECT * FROM test027", PDO::FETCH_LAZY) as $v) {
2223
echo "lazy: " . $v->id.$v->name."\n";

‎ext/pdo/tests/pdo_032.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717

1818
$db->exec('CREATE TABLE test032(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
19-
$db->exec("INSERT INTO test032 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
19+
$db->exec("INSERT INTO test032 VALUES(1, 'A')");
20+
$db->exec("INSERT INTO test032 VALUES(2, 'B')");
21+
$db->exec("INSERT INTO test032 VALUES(3, 'C')");
2022

2123
// Lower case columns
2224
$db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);

‎ext/pdo_oci/tests/bug54379.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ $db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
1717
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1818

1919
$db->exec("CREATE TABLE test54379 (col1 NVARCHAR2(20))");
20-
$db->exec("INSERT INTO test54379 VALUES('12345678901234567890'), ('あいうえおかきくけこさしすせそたちつてと')");
20+
$db->exec("INSERT INTO test54379 VALUES('12345678901234567890')");
21+
$db->exec("INSERT INTO test54379 VALUES('あいうえおかきくけこさしすせそたちつてと')");
2122
$stmt = $db->prepare("SELECT * FROM test54379");
2223
$stmt->execute();
2324
var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));

0 commit comments

Comments
 (0)