helly Thu Sep 4 10:54:55 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite/tests sqlite_oo_010.phpt sqlite_oo_013.phpt
sqlite_oo_016.phpt sqlite_oo_020.phpt
sqlite_oo_024.phpt
Log:
Go with the mess
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.91 php-src/ext/sqlite/sqlite.c:1.92
--- php-src/ext/sqlite/sqlite.c:1.91 Sun Aug 31 08:41:48 2003
+++ php-src/ext/sqlite/sqlite.c Thu Sep 4 10:54:52 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.91 2003/08/31 12:41:48 zeev Exp $
+ $Id: sqlite.c,v 1.92 2003/09/04 14:54:52 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -226,8 +226,8 @@
PHP_ME_MAPPING(current, sqlite_current, NULL)
PHP_ME_MAPPING(next, sqlite_next, NULL)
PHP_ME_MAPPING(prev, sqlite_prev, NULL)
- PHP_ME_MAPPING(has_more, sqlite_has_more, NULL)
- PHP_ME_MAPPING(has_prev, sqlite_has_prev, NULL)
+ PHP_ME_MAPPING(hasmore, sqlite_has_more, NULL)
+ PHP_ME_MAPPING(hasprev, sqlite_has_prev, NULL)
/* spl_sequence */
PHP_ME_MAPPING(rewind, sqlite_rewind, NULL)
/* additional */
@@ -248,7 +248,7 @@
/* spl_forward */
PHP_ME_MAPPING(current, sqlite_current, NULL)
PHP_ME_MAPPING(next, sqlite_next, NULL)
- PHP_ME_MAPPING(has_more, sqlite_has_more, NULL)
+ PHP_ME_MAPPING(hasmore, sqlite_has_more, NULL)
{NULL, NULL, NULL}
};
@@ -944,7 +944,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.91 2003/08/31 12:41:48 zeev Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.92 2003/09/04 14:54:52 helly Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
Index: php-src/ext/sqlite/tests/sqlite_oo_010.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.1
php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.2
--- php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.1 Sun Jun 22 13:19:46 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_010.phpt Thu Sep 4 10:54:53 2003
@@ -22,7 +22,7 @@
}
$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
-while ($row = $r->has_more()) {
+while ($row = $r->hasMore()) {
var_dump($r->current());
$r->next();
}
Index: php-src/ext/sqlite/tests/sqlite_oo_013.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.1
php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.2
--- php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.1 Sun Jun 22 13:19:46 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_013.phpt Thu Sep 4 10:54:53 2003
@@ -22,7 +22,7 @@
echo "====BUFFERED====\n";
$r = $db->query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
var_dump($r->current(SQLITE_NUM));
var_dump($r->column(0));
var_dump($r->column(1));
@@ -32,7 +32,7 @@
}
echo "====UNBUFFERED====\n";
$r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
var_dump($r->column(0));
var_dump($r->column('b'));
var_dump($r->column(1));
Index: php-src/ext/sqlite/tests/sqlite_oo_016.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.3 Thu Jun 26 17:37:54 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_016.phpt Thu Sep 4 10:54:53 2003
@@ -22,12 +22,12 @@
echo "====BUFFERED====\n";
$r = $db->query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
var_dump($r->fetch_single());
}
echo "====UNBUFFERED====\n";
$r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
var_dump($r->fetch_single());
}
echo "DONE!\n";
Index: php-src/ext/sqlite/tests/sqlite_oo_020.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.2 Sun Jun 22 15:03:24 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_020.phpt Thu Sep 4 10:54:53 2003
@@ -19,8 +19,8 @@
try {
$db = sqlite_factory();
} catch(sqlite_exception $err) {
- echo "Message: ".$err->getmessage()."\n";
- echo "File: ".$err->getfile()."\n";
+ echo "Message: ".$err->getMessage()."\n";
+ echo "File: ".$err->getFile()."\n";
}
$db = sqlite_factory($dbname);
@@ -37,7 +37,7 @@
}
$r = $db->unbuffered_query("SELECT a, b from strings");
-while ($r->has_more()) {
+while ($r->hasMore()) {
var_dump($r->current(SQLITE_NUM));
$r->next();
}
Index: php-src/ext/sqlite/tests/sqlite_oo_024.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.2 Thu Aug 28 19:30:16 2003
+++ php-src/ext/sqlite/tests/sqlite_oo_024.phpt Thu Sep 4 10:54:53 2003
@@ -29,46 +29,46 @@
echo "====class24====\n";
$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
-while ($res->has_more()) {
+while ($res->hasMore()) {
var_dump($res->fetch_object('class24'));
}
echo "====stdclass====\n";
$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
-while ($res->has_more()) {
+while ($res->hasMore()) {
var_dump($res->fetch_object());
}
echo "====DONE!====\n";
?>
--EXPECTF--
-====class24====
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(3) "one"
-}
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(3) "two"
-}
-class24::__construct
-object(class24)#%d (1) {
- ["a"]=>
- string(5) "three"
-}
-====stdclass====
-object(stdClass)#%d (1) {
- ["a"]=>
- string(3) "one"
-}
-object(stdClass)#%d (1) {
- ["a"]=>
- string(3) "two"
-}
-object(stdClass)#%d (1) {
- ["a"]=>
- string(5) "three"
-}
+====class24====
+class24::__construct
+object(class24)#%d (1) {
+ ["a"]=>
+ string(3) "one"
+}
+class24::__construct
+object(class24)#%d (1) {
+ ["a"]=>
+ string(3) "two"
+}
+class24::__construct
+object(class24)#%d (1) {
+ ["a"]=>
+ string(5) "three"
+}
+====stdclass====
+object(stdClass)#%d (1) {
+ ["a"]=>
+ string(3) "one"
+}
+object(stdClass)#%d (1) {
+ ["a"]=>
+ string(3) "two"
+}
+object(stdClass)#%d (1) {
+ ["a"]=>
+ string(5) "three"
+}
====DONE!====
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
