iliaa Thu Jul 7 14:50:01 2005 EDT
Modified files:
/php-src/ext/pdo/tests pdo_012.phpt pdo_013.phpt pdo_016.phpt
pdo_017.phpt pdo_018.phpt pdo_021.phpt
pdo_026.phpt
Log:
1st set of fixes to make tests work with MySQL
# Additional changes pending
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_012.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_012.phpt
diff -u php-src/ext/pdo/tests/pdo_012.phpt:1.4
php-src/ext/pdo/tests/pdo_012.phpt:1.5
--- php-src/ext/pdo/tests/pdo_012.phpt:1.4 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_012.phpt Thu Jul 7 14:49:58 2005
@@ -30,9 +30,13 @@
}
}
+unset($stmt);
+
$stmt = $db->query($SELECT, PDO_FETCH_CLASS, 'Test');
var_dump($stmt->fetchAll());
+unset($stmt);
+
$stmt = $db->query($SELECT, PDO_FETCH_NUM);
$stmt->setFetchMode(PDO_FETCH_CLASS, 'Test', array('Changed'));
var_dump($stmt->fetchAll());
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_013.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_013.phpt
diff -u php-src/ext/pdo/tests/pdo_013.phpt:1.4
php-src/ext/pdo/tests/pdo_013.phpt:1.5
--- php-src/ext/pdo/tests/pdo_013.phpt:1.4 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_013.phpt Thu Jul 7 14:49:58 2005
@@ -36,11 +36,15 @@
}
}
+unset($stmt);
+
foreach ($db->query($SELECT, PDO_FETCH_CLASS, 'Test') as $data)
{
var_dump($data);
}
+unset($stmt);
+
$stmt = $db->query($SELECT, PDO_FETCH_CLASS, 'Test', array('WOW'));
foreach($stmt as $data)
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_016.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/pdo/tests/pdo_016.phpt
diff -u php-src/ext/pdo/tests/pdo_016.phpt:1.6
php-src/ext/pdo/tests/pdo_016.phpt:1.7
--- php-src/ext/pdo/tests/pdo_016.phpt:1.6 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_016.phpt Thu Jul 7 14:49:58 2005
@@ -17,6 +17,11 @@
$db->exec('INSERT INTO test VALUES(0, \'String0\')');
$db->exec('INSERT INTO test VALUES(1, \'String1\')');
$db->exec('INSERT INTO test VALUES(2, \'String2\')');
+
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+ $db->setAttribute(PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1);
+}
+
$stmt1 = $db->prepare('SELECT COUNT(idx) FROM test');
$stmt2 = $db->prepare('SELECT idx, txt FROM test ORDER by idx');
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_017.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_017.phpt
diff -u php-src/ext/pdo/tests/pdo_017.phpt:1.4
php-src/ext/pdo/tests/pdo_017.phpt:1.5
--- php-src/ext/pdo/tests/pdo_017.phpt:1.4 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_017.phpt Thu Jul 7 14:49:58 2005
@@ -22,7 +22,13 @@
require getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
-$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))');
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+ $suf = ' Type=InnoDB';
+} else {
+ $suf = '';
+}
+
+$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val
VARCHAR(10))'.$suf);
$db->exec("INSERT INTO test VALUES(1, 'A')");
$db->exec("INSERT INTO test VALUES(2, 'B')");
$db->exec("INSERT INTO test VALUES(3, 'C')");
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_018.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/pdo/tests/pdo_018.phpt
diff -u php-src/ext/pdo/tests/pdo_018.phpt:1.5
php-src/ext/pdo/tests/pdo_018.phpt:1.6
--- php-src/ext/pdo/tests/pdo_018.phpt:1.5 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_018.phpt Thu Jul 7 14:49:58 2005
@@ -77,6 +77,10 @@
var_dump($db->query('SELECT COUNT(*) FROM classtypes')->fetchColumn());
var_dump($db->query('SELECT id, name FROM classtypes ORDER by
id')->fetchAll(PDO_FETCH_COLUMN|PDO_FETCH_UNIQUE));
+if ($db->getAttribute(PDO_ATTR_DRIVER_NAME) == 'mysql') {
+ $db->setAttribute(PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1);
+}
+
$objs = array();
$objs[0] = new stdClass;
$objs[1] = new TestBase;
@@ -101,6 +105,8 @@
echo "===TYPES===\n";
var_dump($ctypes);
+unset($stmt);
+
echo "===INSERT===\n";
$stmt = $db->prepare('INSERT INTO test VALUES(:id, :classtype, :val)');
$stmt->bindParam(':id', $idx);
@@ -121,6 +127,8 @@
$stmt->execute();
}
+unset($stmt);
+
echo "===DATA===\n";
var_dump($db->query('SELECT test.val FROM test')->fetchAll(PDO_FETCH_COLUMN));
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_021.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/pdo/tests/pdo_021.phpt
diff -u php-src/ext/pdo/tests/pdo_021.phpt:1.6
php-src/ext/pdo/tests/pdo_021.phpt:1.7
--- php-src/ext/pdo/tests/pdo_021.phpt:1.6 Thu Jul 7 11:32:32 2005
+++ php-src/ext/pdo/tests/pdo_021.phpt Thu Jul 7 14:49:58 2005
@@ -36,6 +36,8 @@
$num = $select->fetchColumn();
echo 'There are ' . $num . " rows in the table.\n";
+unset($stmt);
+
// Insert using named parameters
$stmt2 = $db->prepare("INSERT INTO test VALUES(:first, :second, :third)");
foreach ($data as $row) {
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_026.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_026.phpt
diff -u php-src/ext/pdo/tests/pdo_026.phpt:1.4
php-src/ext/pdo/tests/pdo_026.phpt:1.5
--- php-src/ext/pdo/tests/pdo_026.phpt:1.4 Thu Jul 7 11:32:32 2005
+++ php-src/ext/pdo/tests/pdo_026.phpt Thu Jul 7 14:49:58 2005
@@ -62,6 +62,8 @@
$stmt->execute($row);
}
+unset($stmt);
+
$stmt = $db->query('SELECT * FROM test');
var_dump(get_class($stmt));
var_dump(get_class($stmt->dbh));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
