PHP mysqlnd svn commit: r1318 - trunk/tests/ext/pdo

[uwendel]

Author: uwendel
Date: 2008-03-04 15:04:47 +0100 (Tue, 04 Mar 2008)
New Revision: 1318

Modified:
   trunk/tests/ext/pdo/bug_38253.phpt
   trunk/tests/ext/pdo/pdo_005.phpt
   trunk/tests/ext/pdo/pdo_018.phpt
Log:
Merge from php.net


Modified: trunk/tests/ext/pdo/bug_38253.phpt
===================================================================
--- trunk/tests/ext/pdo/bug_38253.phpt	2008-03-04 14:02:09 UTC (rev 1317)
+++ trunk/tests/ext/pdo/bug_38253.phpt	2008-03-04 14:04:47 UTC (rev 1318)
@@ -14,7 +14,7 @@
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $pdo = PDOTest::factory();
 
-$pdo->exec ("create table test (id integer primary key, n text)");
+$pdo->exec ("create table test (id integer primary key, n varchar(255))");
 $pdo->exec ("INSERT INTO test (id, n) VALUES (1, 'hi')");
 
 $pdo->setAttribute (PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_CLASS);

Modified: trunk/tests/ext/pdo/pdo_005.phpt
===================================================================
--- trunk/tests/ext/pdo/pdo_005.phpt	2008-03-04 14:02:09 UTC (rev 1317)
+++ trunk/tests/ext/pdo/pdo_005.phpt	2008-03-04 14:04:47 UTC (rev 1318)
@@ -52,7 +52,7 @@
 --EXPECTF--
 array(3) {
   [0]=>
-  object(stdClass)#3 (3) {
+  object(stdClass)#%d (3) {
     ["id"]=>
     string(1) "1"
     ["val"]=>
@@ -61,7 +61,7 @@
     string(2) "AA"
   }
   [1]=>
-  object(stdClass)#4 (3) {
+  object(stdClass)#%d (3) {
     ["id"]=>
     string(1) "2"
     ["val"]=>
@@ -70,7 +70,7 @@
     string(2) "BB"
   }
   [2]=>
-  object(stdClass)#5 (3) {
+  object(stdClass)#%d (3) {
     ["id"]=>
     string(1) "3"
     ["val"]=>
@@ -81,7 +81,7 @@
 }
 array(3) {
   [0]=>
-  object(TestBase)#5 (3) {
+  object(TestBase)#%d (3) {
     ["id"]=>
     string(1) "1"
     ["val":protected]=>
@@ -90,7 +90,7 @@
     string(2) "AA"
   }
   [1]=>
-  object(TestBase)#4 (3) {
+  object(TestBase)#%d (3) {
     ["id"]=>
     string(1) "2"
     ["val":protected]=>
@@ -99,7 +99,7 @@
     string(2) "BB"
   }
   [2]=>
-  object(TestBase)#3 (3) {
+  object(TestBase)#%d (3) {
     ["id"]=>
     string(1) "3"
     ["val":protected]=>
@@ -113,7 +113,7 @@
 TestDerived::__construct(2,3)
 array(3) {
   [0]=>
-  object(TestDerived)#3 (5) {
+  object(TestDerived)#%d (5) {
     ["row":protected]=>
     int(0)
     ["id"]=>
@@ -126,7 +126,7 @@
     string(2) "AA"
   }
   [1]=>
-  object(TestDerived)#4 (5) {
+  object(TestDerived)#%d (5) {
     ["row":protected]=>
     int(1)
     ["id"]=>
@@ -139,7 +139,7 @@
     string(2) "BB"
   }
   [2]=>
-  object(TestDerived)#5 (5) {
+  object(TestDerived)#%d (5) {
     ["row":protected]=>
     int(2)
     ["id"]=>

Modified: trunk/tests/ext/pdo/pdo_018.phpt
===================================================================
--- trunk/tests/ext/pdo/pdo_018.phpt	2008-03-04 14:02:09 UTC (rev 1317)
+++ trunk/tests/ext/pdo/pdo_018.phpt	2008-03-04 14:04:47 UTC (rev 1318)
@@ -20,7 +20,7 @@
 	public    $BasePub = 'Public';
 	protected $BasePro = 'Protected';
 	private   $BasePri = 'Private';
-
+	
 	function serialize()
 	{
 		$serialized = array();
@@ -31,7 +31,7 @@
 		echo __METHOD__ . "() = '$serialized'\n";
 		return $serialized;
 	}
-
+	
 	function unserialize($serialized)
 	{
 		echo __METHOD__ . "($serialized)\n";
@@ -55,7 +55,7 @@
 		echo __METHOD__ . "()\n";
 		return TestBase::serialize();
 	}
-
+	
 	function unserialize($serialized)
 	{
 		echo __METHOD__ . "()\n";
@@ -68,9 +68,9 @@
 }
 
 $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(20) NOT
NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
-$db->exec('INSERT INTO classtypes VALUES(1, \'TestBase\')');
-$db->exec('INSERT INTO classtypes VALUES(2, \'TestDerived\')');
+$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); 
+$db->exec('INSERT INTO classtypes VALUES(1, \'TestBase\')'); 
+$db->exec('INSERT INTO classtypes VALUES(2, \'TestDerived\')'); 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val
VARCHAR(255))');
 
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -121,7 +121,7 @@
 	{
 		$val = '';
 	}
-	$stmt->execute();
+	$stmt->execute();	
 }
 
 unset($stmt);