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

[uwendel]

Author: uwendel
Date: 2007-08-21 15:56:18 +0200 (Tue, 21 Aug 2007)
New Revision: 936

Modified:
   trunk/tests/ext/mysqli/mysqli_fetch_field.phpt
Log:
Type codes are borked.


Modified: trunk/tests/ext/mysqli/mysqli_fetch_field.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field.phpt	2007-08-21 10:45:03 UTC (rev 935)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field.phpt	2007-08-21 13:56:18 UTC (rev 936)
@@ -88,13 +88,14 @@
 
 		if ($field->type != $php_type) {
 			$code_name = 'unknown';
-			foreach ($datatypes as $k => $v)
+			foreach ($datatypes as $k => $v) {
 				if ($k == $field->type) {
-					$code_name = $v[0];
+					$code_name = (is_array($v)) ? $v[0] : $v;
 					break;
 				}
-			printf("[009 + 6] %s, expecting type code %d got code %s/%s\n",
-				$sql_type, $php_type, $code_name, $field->type);
+			}
+			printf("[009 + 6] Expecting %d for %s got code %d for %s\n",
+				$php_type, $sql_type, $field->type, $code_name);
 			return false;
 		}
 
@@ -104,7 +105,7 @@
 	$datatypes = array(
 		MYSQLI_TYPE_TINY => array('TINYINT', 5),
 		MYSQLI_TYPE_SHORT => array('SMALLINT', 10),
-		// MYSQLI_TYPE_LONG => array('BIGINT', 100),
+		MYSQLI_TYPE_LONG => 'MYSQLI_TYPE_LONG',
 		MYSQLI_TYPE_FLOAT => array('FLOAT', '1.3'),
 		MYSQLI_TYPE_DOUBLE => array('DOUBLE', '1.4'),
 		MYSQLI_TYPE_TIMESTAMP => array('TIMESTAMP', '2007-08-20 18:34:00'),
@@ -121,14 +122,12 @@
 		MYSQLI_TYPE_LONG_BLOB => array("LONGBLOB", "Small is beautiful?"),
 		MYSQLI_TYPE_BLOB => array("BLOB", 'silly'),
 		MYSQLI_TYPE_VAR_STRING => array("VARCHAR(32768)", 'varchar'),
-		// MYSQLI_TYPE_STRING => array('CHAR(100)', 'char'),
+		MYSQLI_TYPE_STRING => 'MYSQLI_TYPE_STRING',
 		MYSQLI_TYPE_CHAR => array('CHAR(1)', 'a'),
-/*
-		"MYSQLI_TYPE_NULL"					=> true,
-		"MYSQLI_TYPE_NEWDATE"				=> true,
-		"MYSQLI_TYPE_INTERVAL"				=> true,
-		"MYSQLI_TYPE_GEOMETRY"				=> true,
-	*/
+		MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL',
+		MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE',
+		MYSQLI_TYPE_INTERVAL => 'MYSQLI_TYPE_INTERVAL',
+		MYSQLI_TYPE_GEOMETRY => 'MYSQLI_TYPE_GEOMETRY',
 	);
 
 	if ($IS_MYSQLND) {
@@ -139,8 +138,8 @@
 
 	if ($version > 50002) {
 		$datatypes = array_merge($datatypes, array(
-			"MYSQLI_TYPE_NEWDECIMAL"	=> array('DECIMAL', '1.1'),
-			"MYSQLI_TYPE_BIT" => array('BIT', 0),
+			MYSQLI_TYPE_NEWDECIMAL	=> array('DECIMAL', '1.1'),
+			MYSQLI_TYPE_BIT => array('BIT', 0),
 		));
 	} else {
 		$datatypes = array_merge($datatypes, array(
@@ -149,8 +148,10 @@
 	}
 
 	sort($datatypes);
-	foreach ($datatypes as $php_type => $datatype)
-		mysqli_field_datatypes($link, $datatype[0], $datatype[1], $php_type, $datatypes);
+	foreach ($datatypes as $php_type => $datatype) {
+		if (is_array($datatype))
+			mysqli_field_datatypes($link, $datatype[0], $datatype[1], $php_type, $datatypes);
+	}
 
 	mysqli_close($link);