mboeren Wed Aug 13 03:54:31 2003 EDT
Modified files:
/php-src/ext/dbx/tests 003.phpt dbx_test.p
Log:
Remove special-case from test for SQLite persistent connections.
Index: php-src/ext/dbx/tests/003.phpt
diff -u php-src/ext/dbx/tests/003.phpt:1.6 php-src/ext/dbx/tests/003.phpt:1.7
--- php-src/ext/dbx/tests/003.phpt:1.6 Wed Jul 9 12:31:40 2003
+++ php-src/ext/dbx/tests/003.phpt Wed Aug 13 03:54:31 2003
@@ -49,18 +49,14 @@
}
}
-if ($module != DBX_SQLITE) { // skip persistent tests for sqlite until that bug is
solved
-
$dlo = dbx_connect($module_name, $host, $database, $username, $password,
DBX_PERSISTENT);
if ($dlo!=0) {
print('persistent connect using string ok'."\n");
- var_dump($dlo->handle);
dbx_close($dlo);
}
$dlo = dbx_connect($module, $host, $database, $username, $password, DBX_PERSISTENT);
if ($dlo!=0) {
print('persistent connect using constant ok'."\n");
- var_dump($dlo->handle);
dbx_close($dlo);
}
// sqlite is a special case as it will just create a db if it isn't found
@@ -77,22 +73,20 @@
dbx_close($dlo);
}
}
-$dlo = @dbx_connect($module, $host, $database, $nonexisting_username,
$nonexisting_password, DBX_PERSISTENT);
-if ($dlo==0) {
- print('persistent connect with false username/password combi failed, so it\'s
ok'."\n");
- }
-else {
- print_r($dlo);
- dbx_close($dlo);
+// sqlite is a special case as it doesn't use user/password restrictions
+if ($module == DBX_SQLITE) {
+ print('persistent connect with false username/password combi failed, so it\'s
ok'."\n");
}
-
-} // skip persistent tests for sqlite until that bug is solved
else {
- print('persistent connect using string ok'."\n");
- print('persistent connect using constant ok'."\n");
- print('persistent connect to non-existing database failed, so it\'s ok'."\n");
- print('persistent connect with false username/password combi failed, so it\'s
ok'."\n");
-}
+ $dlo = @dbx_connect($module, $host, $database, $nonexisting_username,
$nonexisting_password, DBX_PERSISTENT);
+ if ($dlo==0) {
+ print('persistent connect with false username/password combi failed, so it\'s
ok'."\n");
+ }
+ else {
+ print_r($dlo);
+ dbx_close($dlo);
+ }
+ }
$dlo = @dbx_connect($module, $host, $database, $username, $password, DBX_PERSISTENT,
"12many");
if ($dlo==0) {
Index: php-src/ext/dbx/tests/dbx_test.p
diff -u php-src/ext/dbx/tests/dbx_test.p:1.10 php-src/ext/dbx/tests/dbx_test.p:1.11
--- php-src/ext/dbx/tests/dbx_test.p:1.10 Wed Jul 9 12:31:40 2003
+++ php-src/ext/dbx/tests/dbx_test.p Wed Aug 13 03:54:31 2003
@@ -63,7 +63,7 @@
case DBX_SQLITE:
$module=DBX_SQLITE;
$host="";
- $database="ext\\dbx\\tests\\dbx_test.sqlite.db";
+ $database="dbx_test.sqlite.db";
$username="";
$password="";
$module_name="sqlite";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
