PHP mysqlnd svn commit: r938 - trunk/tests/ext/mysqli

[uwendel]

Author: uwendel
Date: 2007-08-21 16:50:46 +0200 (Tue, 21 Aug 2007)
New Revision: 938

Modified:
   trunk/tests/ext/mysqli/mysqli_fetch_field_types.phpt
Log:
array_merge I have you for folding keys and not taking
into account that array often means hash for PHP people...


Modified: trunk/tests/ext/mysqli/mysqli_fetch_field_types.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field_types.phpt	2007-08-21 14:30:03 UTC (rev 937)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field_types.phpt	2007-08-21 14:50:46 UTC (rev 938)
@@ -75,14 +75,14 @@
 		MYSQLI_TYPE_DATETIME => array('DATETIME', '2007-08-20 18:42:01'),
 		MYSQLI_TYPE_YEAR => array('YEAR', '2007'),
 		MYSQLI_TYPE_ENUM => array('ENUM("everything", "is", "just", "wonderful")', 'is'),
-		MYSQLI_TYPE_SET	=> array('SET("I", "smash", "the")', 'I,smash,the'),
-		MYSQLI_TYPE_TINY_BLOB => array("TINYBLOB", "I got a tiny blog"),
-		MYSQLI_TYPE_MEDIUM_BLOB => array("MEDIUMBLOB", "No blob for masses"),
-		MYSQLI_TYPE_LONG_BLOB => array("LONGBLOB", "Small is beautiful?"),
+		// MYSQLI_TYPE_SET	=> array('SET("I", "smash", "the")', 'I,smash,the'), - string
+		// MYSQLI_TYPE_TINY_BLOB => array("TINYBLOB", "I got a tiny blog"), - blob
+		// MYSQLI_TYPE_MEDIUM_BLOB => array("MEDIUMBLOB", "No blob for masses"), - blob
+		// MYSQLI_TYPE_LONG_BLOB => array("LONGBLOB", "Small is beautiful?"), - blob
 		MYSQLI_TYPE_BLOB => array("BLOB", 'silly'),
 		MYSQLI_TYPE_VAR_STRING => array("VARCHAR(32768)", 'varchar'),
 		MYSQLI_TYPE_STRING => 'MYSQLI_TYPE_STRING',
-		MYSQLI_TYPE_CHAR => array('CHAR(1)', 'a'),
+		MYSQLI_TYPE_STRING => array('CHAR(1)', 'a'),
 		MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL',
 		MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE',
 		MYSQLI_TYPE_INTERVAL => 'MYSQLI_TYPE_INTERVAL',
@@ -96,17 +96,12 @@
 	}
 
 	if ($version > 50002) {
-		$datatypes = array_merge($datatypes, array(
-			MYSQLI_TYPE_NEWDECIMAL	=> array('DECIMAL', '1.1'),
-			MYSQLI_TYPE_BIT => array('BIT', 0),
-		));
+		$datatypes[MYSQLI_TYPE_NEWDECIMAL] = array('DECIMAL', '1.1');
+		$datatypes[MYSQLI_TYPE_BIT] = array('BIT', 0);
 	} else {
-		$datatypes = array_merge($datatypes, array(
-			MYSQLI_TYPE_DECIMAL	=> array('DECIMAL', '1.1'),
-		));
+		$datatypes[MYSQLI_TYPE_DECIMAL] = array('DECIMAL', '1.1');
 	}
 
-	sort($datatypes);
 	foreach ($datatypes as $php_type => $datatype) {
 		if (is_array($datatype))
 			mysqli_field_datatypes($link, $datatype[0], $datatype[1], $php_type, $datatypes);