Fix tests

kocsismate · kocsismate · commit fbc9c8503785 · 2023-10-16T23:11:17.000+02:00
diff --git a/ext/pdo/tests/bug_36798.phpt b/ext/pdo/tests/bug_36798.phpt
@@ -45,5 +45,5 @@ PDOTest::dropTableIfExists($db, "test36798");
 --EXPECT--
 array(1) {
   [0]=>
-  string(1) "�"
+  string(2) "Ã"
 }
diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test002(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test002 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
+$db->exec("INSERT INTO test002 VALUES(1, 'A')");
+$db->exec("INSERT INTO test002 VALUES(2, 'B')");
+$db->exec("INSERT INTO test002 VALUES(3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test002');
 $stmt->execute();
diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test003(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test003 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
+$db->exec("INSERT INTO test003 VALUES(1, 'A')");
+$db->exec("INSERT INTO test003 VALUES(2, 'B')");
+$db->exec("INSERT INTO test003 VALUES(3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test003');
 $stmt->execute();
diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test004(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test004 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
+$db->exec("INSERT INTO test004 VALUES(1, 'A')");
+$db->exec("INSERT INTO test004 VALUES(2, 'B')");
+$db->exec("INSERT INTO test004 VALUES(3, 'C')");
 
 $stmt = $db->prepare('SELECT * from test004');
 $stmt->execute();
diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test005(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))');
-$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA'), (2, 'B', 'BB'), (3, 'C', 'CC')");
+$db->exec("INSERT INTO test005 VALUES(1, 'A', 'AA')");
+$db->exec("INSERT INTO test005 VALUES(2, 'B', 'BB')");
+$db->exec("INSERT INTO test005 VALUES(3, 'C', 'CC')");
 
 $stmt = $db->prepare('SELECT id, val, val2 from test005');
 
diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test006(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test006 VALUES(1, 'A'), (2, 'A'), (3, 'C')");
+$db->exec("INSERT INTO test006 VALUES(1, 'A')");
+$db->exec("INSERT INTO test006 VALUES(2, 'A')");
+$db->exec("INSERT INTO test006 VALUES(3, 'C')");
 
 $stmt = $db->prepare('SELECT val, id from test006');
 
diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test007(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test007 VALUES('A', 'A'), ('B', 'A'), ('C', 'C')");
+$db->exec("INSERT INTO test007 VALUES('A', 'A')");
+$db->exec("INSERT INTO test007 VALUES('B', 'A')");
+$db->exec("INSERT INTO test007 VALUES('C', 'C')");
 
 $stmt = $db->prepare('SELECT id, val from test007');
 
diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
@@ -16,11 +16,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes009(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec("INSERT INTO classtypes009 VALUES(0, 'stdClass'), (1, 'Test1'), (2, 'Test2')");
+$db->exec("INSERT INTO classtypes009 VALUES(0, 'stdClass')");
+$db->exec("INSERT INTO classtypes009 VALUES(1, 'Test1')");
+$db->exec("INSERT INTO classtypes009 VALUES(2, 'Test2')");
 $db->exec('CREATE TABLE test009(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))');
-$db->exec("INSERT INTO test009 VALUES(1, 0, 'A'), (2, 1, 'B'), (3, 2, 'C'), (4, 3, 'D')");
+$db->exec("INSERT INTO test009 VALUES(1, 0, 'A')");
+$db->exec("INSERT INTO test009 VALUES(2, 1, 'B')");
+$db->exec("INSERT INTO test009 VALUES(3, 2, 'C')");
+$db->exec("INSERT INTO test009 VALUES(4, 3, 'D')");
 
-$stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test009 LEFT JOIN classtypes009 ON test.classtype=classtypes.id');
+$stmt = $db->prepare('SELECT classtypes009.name, classtypes009.id AS id, test009.val AS val FROM test009 LEFT JOIN classtypes009 ON test009.classtype=classtypes009.id');
 
 class Test1
 {
diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
@@ -16,11 +16,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes010(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec("INSERT INTO classtypes010 VALUES(0, 'stdClass'), (1, 'Test1'), (2, 'Test2'));
+$db->exec("INSERT INTO classtypes010 VALUES(0, 'stdClass')");
+$db->exec("INSERT INTO classtypes010 VALUES(1, 'Test1')");
+$db->exec("INSERT INTO classtypes010 VALUES(2, 'Test2')");
 $db->exec('CREATE TABLE test010(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec("INSERT INTO test010 VALUES(1, 0, 'A', 'Group1'), (2, 1, 'B', 'Group1'), (3, 2, 'C', 'Group2'), (4, 3, 'D', 'Group2')");
+$db->exec("INSERT INTO test010 VALUES(1, 0, 'A', 'Group1')");
+$db->exec("INSERT INTO test010 VALUES(2, 1, 'B', 'Group1')");
+$db->exec("INSERT INTO test010 VALUES(3, 2, 'C', 'Group2')");
+$db->exec("INSERT INTO test010 VALUES(4, 3, 'D', 'Group2')");
 
-$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');
+$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');
 
 class Test1
 {
diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
@@ -16,7 +16,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test011(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec("INSERT INTO test011 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group1'), (3, 'C', 'Group2'), (4, 'D', 'Group2')");
+$db->exec("INSERT INTO test011 VALUES(1, 'A', 'Group1')");
+$db->exec("INSERT INTO test011 VALUES(2, 'B', 'Group1')");
+$db->exec("INSERT INTO test011 VALUES(3, 'C', 'Group2')");
+$db->exec("INSERT INTO test011 VALUES(4, 'D', 'Group2')");
 
 class DerivedStatement extends PDOStatement
 {
diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test012(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec("INSERT INTO test012 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
+$db->exec("INSERT INTO test012 VALUES(1, 'A', 'Group1')");
+$db->exec("INSERT INTO test012 VALUES(2, 'B', 'Group2')");
 
 $SELECT = 'SELECT val, grp FROM test012';
 
diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test013(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec("INSERT INTO test013 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
+$db->exec("INSERT INTO test013 VALUES(1, 'A', 'Group1')");
+$db->exec("INSERT INTO test013 VALUES(2, 'B', 'Group2')");
 
 $SELECT = 'SELECT val, grp FROM test013';
 
diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test014(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec("INSERT INTO test014 VALUES(1, 'A', 'Group1'), (2, 'B', 'Group2')");
+$db->exec("INSERT INTO test014 VALUES(1, 'A', 'Group1')");
+$db->exec("INSERT INTO test014 VALUES(2, 'B', 'Group2')");
 $SELECT = 'SELECT val, grp FROM test014';
 
 class Test
diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test015(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))');
-$db->exec("INSERT INTO test015 VALUES(1, 'A', 'A2'), (2, 'A', 'B2')");
+$db->exec("INSERT INTO test015 VALUES(1, 'A', 'A2')");
+$db->exec("INSERT INTO test015 VALUES(2, 'A', 'B2')");
 
 $select1 = $db->prepare('SELECT id, val, val2 FROM test015');
 $select2 = $db->prepare('SELECT val, val2 FROM test015');
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
@@ -21,7 +21,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
 }
 
 $db->exec('CREATE TABLE test016(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
-$db->exec("INSERT INTO test016 VALUES(0, 'String0'), (1, 'String1'), (2, 'String2')");
+$db->exec("INSERT INTO test016 VALUES(0, 'String0')");
+$db->exec("INSERT INTO test016 VALUES(1, 'String1')");
+$db->exec("INSERT INTO test016 VALUES(2, 'String2')");
 
 $stmt1 = $db->prepare('SELECT COUNT(idx) FROM test016');
 $stmt2 = $db->prepare('SELECT idx, txt FROM test016 ORDER by idx');
diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
@@ -21,7 +21,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
 }
 
 $db->exec('CREATE TABLE test016a(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
-$db->exec("INSERT INTO test016a VALUES(0, 'String0'), (1, 'String1'), (2, 'String2')");
+$db->exec("INSERT INTO test016a VALUES(0, 'String0')");
+$db->exec("INSERT INTO test016a VALUES(1, 'String1')");
+$db->exec("INSERT INTO test016a VALUES(2, 'String2')");
 
 $stmt1 = $db->prepare('SELECT COUNT(idx) FROM test016a');
 $stmt2 = $db->prepare('SELECT idx, txt FROM test016a ORDER by idx');
diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
@@ -37,7 +37,9 @@ if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
 }
 
 $db->exec('CREATE TABLE test017(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))'.$suf);
-$db->exec("INSERT INTO test017 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
+$db->exec("INSERT INTO test017 VALUES(1, 'A')");
+$db->exec("INSERT INTO test017 VALUES(2, 'B')");
+$db->exec("INSERT INTO test017 VALUES(3, 'C')");
 $delete = $db->prepare('DELETE FROM test017');
 
 function countRows($action) {
diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
@@ -68,7 +68,9 @@ class TestLeaf extends TestDerived
 }
 
 $db->exec('CREATE TABLE classtypes018(id int NOT NULL PRIMARY KEY, name VARCHAR(20) NOT NULL UNIQUE)');
-$db->exec("INSERT INTO classtypes018 VALUES(0, 'stdClass'), (1, 'TestBase'), (2, 'TestDerived')");
+$db->exec("INSERT INTO classtypes018 VALUES(0, 'stdClass')");
+$db->exec("INSERT INTO classtypes018 VALUES(1, 'TestBase')");
+$db->exec("INSERT INTO classtypes018 VALUES(2, 'TestDerived')");
 
 switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
   case 'dblib':
diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
@@ -16,7 +16,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test019(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
-$db->exec("INSERT INTO test019 VALUES(0, 'String0'), (1, 'String1'), (2, 'String2'), (3, 'String3')");
+$db->exec("INSERT INTO test019 VALUES(0, 'String0')");
+$db->exec("INSERT INTO test019 VALUES(1, 'String1')");
+$db->exec("INSERT INTO test019 VALUES(2, 'String2')");
+$db->exec("INSERT INTO test019 VALUES(3, 'String3')");
 
 
 var_dump($db->query('SELECT COUNT(*) FROM test019')->fetchColumn());
diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test020(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
-$db->exec("INSERT INTO test020 VALUES(1, 'A', 'A'), (2, 'B', 'B'), (3, 'C', 'C')");
+$db->exec("INSERT INTO test020 VALUES(1, 'A', 'A')");
+$db->exec("INSERT INTO test020 VALUES(2, 'B', 'B')");
+$db->exec("INSERT INTO test020 VALUES(3, 'C', 'C')");
 
 foreach (array('SELECT id, val FROM test020', 'SELECT id, val, val2 FROM test020', 'SELECT COUNT(*) FROM test020') as $sql) {
 
diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
@@ -64,7 +64,8 @@ $db->test();
 var_dump($db);
 
 $db->query('CREATE TABLE test023(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->query("INSERT INTO test023 VALUES(0, 'A'), (1, 'B')");
+$db->query("INSERT INTO test023 VALUES(0, 'A')");
+$db->query("INSERT INTO test023 VALUES(1, 'B')");
 
 
 $stmt = $db->query('SELECT val, id FROM test023');
diff --git a/ext/pdo/tests/pdo_027.phpt b/ext/pdo/tests/pdo_027.phpt
@@ -16,7 +16,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('create table test027 (id int, name varchar(10))');
-$db->exec("INSERT INTO test027 (id,name) VALUES(1,'test1'), (2,'test2')");
+$db->exec("INSERT INTO test027 (id,name) VALUES(1,'test1')");
+$db->exec("INSERT INTO test027 (id,name) VALUES(2,'test2')");
 
 foreach ($db->query("SELECT * FROM test027", PDO::FETCH_LAZY) as $v) {
     echo "lazy: " . $v->id.$v->name."\n";
diff --git a/ext/pdo/tests/pdo_032.phpt b/ext/pdo/tests/pdo_032.phpt
@@ -16,7 +16,9 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test032(id int NOT NULL PRIMARY KEY, val VARCHAR(10))');
-$db->exec("INSERT INTO test032 VALUES(1, 'A'), (2, 'B'), (3, 'C')");
+$db->exec("INSERT INTO test032 VALUES(1, 'A')");
+$db->exec("INSERT INTO test032 VALUES(2, 'B')");
+$db->exec("INSERT INTO test032 VALUES(3, 'C')");
 
 // Lower case columns
 $db->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt
@@ -17,7 +17,8 @@ $db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 $db->exec("CREATE TABLE test54379 (col1 NVARCHAR2(20))");
-$db->exec("INSERT INTO test54379 VALUES('12345678901234567890'), ('あいうえおかきくけこさしすせそたちつてと')");
+$db->exec("INSERT INTO test54379 VALUES('12345678901234567890')");
+$db->exec("INSERT INTO test54379 VALUES('あいうえおかきくけこさしすせそたちつてと')");
 $stmt = $db->prepare("SELECT * FROM test54379");
 $stmt->execute();
 var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,5 @@ PDOTest::dropTableIfExists($db, "test36798");`
`45`	`45`	`--EXPECT--`
`46`	`46`	`array(1) {`
`47`	`47`	`[0]=>`
`48`		`- string(1) "�"`
	`48`	`+ string(2) "Ã"`
`49`	`49`	`}`