[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_constants.phpt

[Ulf Wendel]

uw  Fri May 29 13:23:01 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_constants.phpt 
  Log:
  MFH - Updating test to reflect API changes.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants.phpt?r1=1.2.2.7r2=1.2.2.8diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_constants.phpt
diff -u php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.7 
php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.8
--- php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.7  Thu Jan 22 
21:01:58 2009
+++ php-src/ext/mysqli/tests/mysqli_constants.phpt  Fri May 29 13:23:01 2009
@@ -50,7 +50,7 @@
MYSQLI_GROUP_FLAG = true,
MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED= true,
MYSQLI_SERVER_QUERY_NO_INDEX_USED = true,
-   
+
MYSQLI_TYPE_DECIMAL   = true,
MYSQLI_TYPE_TINY  = true,
MYSQLI_TYPE_SHORT = true,
@@ -85,13 +85,14 @@
MYSQLI_REPORT_OFF = true,
MYSQLI_SET_CHARSET_NAME   = true,
MYSQLI_REFRESH_GRANT  = true,
-   MYSQLI_REFRESH_LOG= true,
+   MYSQLI_REFRESH_LOG= true,
MYSQLI_REFRESH_TABLES = true,
MYSQLI_REFRESH_HOSTS  = true,
MYSQLI_REFRESH_STATUS = true,
MYSQLI_REFRESH_THREADS= true,
MYSQLI_REFRESH_SLAVE  = true,
MYSQLI_REFRESH_MASTER = true,
+   MYSQLI_DEBUG_TRACE_ENABLED= true,
);
 
/* depends on the build - experimental */
@@ -107,7 +108,6 @@
$version = 50007 + 1;
$expected_constants['MYSQLI_OPT_NET_CMD_BUFFER_SIZE'] = true;
$expected_constants['MYSQLI_OPT_NET_READ_BUFFER_SIZE'] = true;
-   $expected_constants['MYSQLI_DEBUG_TRACE_ENABLED'] = true;
$expected_constants['MYSQLI_ASYNC'] = true;
 
} else {
@@ -118,8 +118,8 @@
$expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
}
if ($version  60005 || $IS_MYSQLND) {
-   $expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true; 
-   } 
+   $expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;
+   }
 
if ($version  50002) {
$expected_constants = array_merge($expected_constants, array(
@@ -158,10 +158,14 @@
} else if (!$IS_MYSQLND) {
/* libmysql only */
 
-   /* are they available in all versions of ext/mysqli ? */
-   $expected_constants[MYSQLI_RPL_MASTER]= true;
-   $expected_constants[MYSQLI_RPL_SLAVE] = true;
-   $expected_constants[MYSQLI_RPL_ADMIN] = true;
+   /* are they available in all versions of ext/mysqli ?
+   ... no we must have removed them at some point - for BC, 
weakening the test
+   */
+   if (defined(MYSQLI_RPL_MASTER)) {
+   $expected_constants[MYSQLI_RPL_MASTER]= true;
+   $expected_constants[MYSQLI_RPL_SLAVE] = true;
+   $expected_constants[MYSQLI_RPL_ADMIN] = true;
+   }
}
 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli/tests mysqli_constants.phpt

[Andrey Hristov]

andrey  Tue Feb 19 15:36:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqli/tests   mysqli_constants.phpt 
  Log:
  Fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_constants.phpt
diff -u php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.2 
php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.3
--- php-src/ext/mysqli/tests/mysqli_constants.phpt:1.2.2.2  Wed Oct 10 
10:13:47 2007
+++ php-src/ext/mysqli/tests/mysqli_constants.phpt  Tue Feb 19 15:36:38 2008
@@ -44,6 +44,8 @@
MYSQLI_TIMESTAMP_FLAG = true,
MYSQLI_SET_FLAG   = true,
MYSQLI_NUM_FLAG   = true,
+   MYSQLI_ENUM_FLAG  = true,
+   MYSQLI_BINARY_FLAG= true,
MYSQLI_PART_KEY_FLAG  = true,
MYSQLI_GROUP_FLAG = true,
MYSQLI_TYPE_DECIMAL   = true,
@@ -90,10 +92,16 @@
$version = 50007 + 1;
$expected_constants['MYSQLI_OPT_NET_CMD_BUFFER_SIZE'] = true;
$expected_constants['MYSQLI_OPT_NET_READ_BUFFER_SIZE'] = true;
+   $expected_constants['MYSQLI_DEBUG_TRACE_ENABLED'] = true;
+   
} else {
$version = mysqli_get_client_version();
}
 
+   if (($version  51122  $version  6) || ($version  60003) || 
$IS_MYSQLND) {
+   $expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
+   }
+
if ($version  50002) {
$expected_constants = array_merge($expected_constants, array(
MYSQLI_TYPE_NEWDECIMAL= true,
@@ -101,6 +109,10 @@
));
}
 
+   if ($version  50002 || $IS_MYSQLND) {
+   $expected_constants['MYSQLI_NO_DEFAULT_VALUE_FLAG'] = true;
+   }
+
if ($version  50003) {
$expected_constants = array_merge($expected_constants, array(
MYSQLI_STMT_ATTR_CURSOR_TYPE  = true,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php