helly Tue Mar 23 18:30:56 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite/tests sqlite_oo_002.phpt sqlite_oo_003.phpt
sqlite_oo_008.phpt sqlite_oo_009.phpt
sqlite_oo_010.phpt sqlite_oo_011.phpt
sqlite_oo_012.phpt sqlite_oo_013.phpt
sqlite_oo_014.phpt sqlite_oo_015.phpt
sqlite_oo_016.phpt sqlite_oo_020.phpt
sqlite_oo_021.phpt sqlite_oo_024.phpt
sqlite_oo_025.phpt sqlite_oo_026.phpt
sqlite_oo_028.phpt sqlite_oo_029.phpt
sqlite_oo_030.phpt sqlite_oo_031.phpt
Log:
Revert studlyCaps change for now
# until we reach a point where the majority knows what they want
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.134&r2=1.135&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.134 php-src/ext/sqlite/sqlite.c:1.135
--- php-src/ext/sqlite/sqlite.c:1.134 Tue Mar 23 03:48:35 2004
+++ php-src/ext/sqlite/sqlite.c Tue Mar 23 18:30:55 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.134 2004/03/23 08:48:35 helly Exp $
+ $Id: sqlite.c,v 1.135 2004/03/23 23:30:55 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -189,32 +189,32 @@
};
function_entry sqlite_funcs_db[] = {
- PHP_ME_MAPPING(__construct, sqlite_open, NULL)
+ PHP_ME_MAPPING(sqlite_db, sqlite_open, NULL)
/* PHP_ME_MAPPING(close, sqlite_close, NULL)*/
PHP_ME_MAPPING(query, sqlite_query, NULL)
- PHP_ME_MAPPING(arrayQuery, sqlite_array_query, NULL)
- PHP_ME_MAPPING(singleQuery, sqlite_single_query, NULL)
- PHP_ME_MAPPING(unbufferedQuery, sqlite_unbuffered_query, NULL)
- PHP_ME_MAPPING(lastInsertRowid, sqlite_last_insert_rowid, NULL)
+ PHP_ME_MAPPING(array_query, sqlite_array_query, NULL)
+ PHP_ME_MAPPING(single_query, sqlite_single_query, NULL)
+ PHP_ME_MAPPING(unbuffered_query, sqlite_unbuffered_query, NULL)
+ PHP_ME_MAPPING(last_insert_rowid, sqlite_last_insert_rowid, NULL)
PHP_ME_MAPPING(changes, sqlite_changes, NULL)
- PHP_ME_MAPPING(createAggregate, sqlite_create_aggregate, NULL)
- PHP_ME_MAPPING(createFunction, sqlite_create_function, NULL)
- PHP_ME_MAPPING(busyTimeout, sqlite_busy_timeout, NULL)
- PHP_ME_MAPPING(lastError, sqlite_last_error, NULL)
- PHP_ME_MAPPING(fetchColumnTypes, sqlite_fetch_column_types, NULL)
+ PHP_ME_MAPPING(create_aggregate, sqlite_create_aggregate, NULL)
+ PHP_ME_MAPPING(create_function, sqlite_create_function, NULL)
+ PHP_ME_MAPPING(busy_timeout, sqlite_busy_timeout, NULL)
+ PHP_ME_MAPPING(last_error, sqlite_last_error, NULL)
+ PHP_ME_MAPPING(fetch_column_types, sqlite_fetch_column_types, NULL)
/* PHP_ME_MAPPING(error_string, sqlite_error_string, NULL) static */
/* PHP_ME_MAPPING(escape_string, sqlite_escape_string, NULL) static */
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_query[] = {
- PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL)
- PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL)
- PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL)
- PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL)
+ PHP_ME_MAPPING(fetch_array, sqlite_fetch_array, NULL)
+ PHP_ME_MAPPING(fetch_object, sqlite_fetch_object, NULL)
+ PHP_ME_MAPPING(fetch_single, sqlite_fetch_single, NULL)
+ PHP_ME_MAPPING(fetch_all, sqlite_fetch_all, NULL)
PHP_ME_MAPPING(column, sqlite_column, NULL)
- PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL)
- PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL)
+ PHP_ME_MAPPING(num_fields, sqlite_num_fields, NULL)
+ PHP_ME_MAPPING(field_name, sqlite_field_name, NULL)
/* spl_forward */
PHP_ME_MAPPING(current, sqlite_current, NULL)
PHP_ME_MAPPING(next, sqlite_next, NULL)
@@ -223,20 +223,20 @@
PHP_ME_MAPPING(rewind, sqlite_rewind, NULL)
/* additional */
PHP_ME_MAPPING(prev, sqlite_prev, NULL)
- PHP_ME_MAPPING(hasPrev, sqlite_has_prev, NULL)
- PHP_ME_MAPPING(numRows, sqlite_num_rows, NULL)
+ PHP_ME_MAPPING(hasprev, sqlite_has_prev, NULL)
+ PHP_ME_MAPPING(num_rows, sqlite_num_rows, NULL)
PHP_ME_MAPPING(seek, sqlite_seek, NULL)
{NULL, NULL, NULL}
};
function_entry sqlite_funcs_ub_query[] = {
- PHP_ME_MAPPING(fetch, sqlite_fetch_array, NULL)
- PHP_ME_MAPPING(fetchObject, sqlite_fetch_object, NULL)
- PHP_ME_MAPPING(fetchSingle, sqlite_fetch_single, NULL)
- PHP_ME_MAPPING(fetchAll, sqlite_fetch_all, NULL)
+ PHP_ME_MAPPING(fetch_array, sqlite_fetch_array, NULL)
+ PHP_ME_MAPPING(fetch_object, sqlite_fetch_object, NULL)
+ PHP_ME_MAPPING(fetch_single, sqlite_fetch_single, NULL)
+ PHP_ME_MAPPING(fetch_all, sqlite_fetch_all, NULL)
PHP_ME_MAPPING(column, sqlite_column, NULL)
- PHP_ME_MAPPING(numFields, sqlite_num_fields, NULL)
- PHP_ME_MAPPING(fieldName, sqlite_field_name, NULL)
+ PHP_ME_MAPPING(num_fields, sqlite_num_fields, NULL)
+ PHP_ME_MAPPING(field_name, sqlite_field_name, NULL)
/* spl_forward */
PHP_ME_MAPPING(current, sqlite_current, NULL)
PHP_ME_MAPPING(next, sqlite_next, NULL)
@@ -1055,7 +1055,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.134 2004/03/23 08:48:35 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.135 2004/03/23 23:30:55 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();
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_002.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_002.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_002.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_002.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_002.phpt:1.2 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_002.phpt Tue Mar 23 18:30:56 2004
@@ -14,7 +14,7 @@
var_dump($db->query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)"));
$r = $db->query("SELECT * from foo");
var_dump($r);
-var_dump($r->fetch());
+var_dump($r->fetch_array());
?>
--EXPECTF--
object(sqlite_db)#%d (0) {
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_003.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_003.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_003.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_003.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_003.phpt:1.3 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_003.phpt Tue Mar 23 18:30:56 2004
@@ -12,11 +12,11 @@
$db->query("CREATE TABLE foo(c1 date, c2 time, c3 varchar(64))");
$db->query("INSERT INTO foo VALUES ('2002-01-02', '12:49:00', NULL)");
$r = $db->query("SELECT * from foo");
-var_dump($r->fetch(SQLITE_BOTH));
+var_dump($r->fetch_array(SQLITE_BOTH));
$r = $db->query("SELECT * from foo");
-var_dump($r->fetch(SQLITE_NUM));
+var_dump($r->fetch_array(SQLITE_NUM));
$r = $db->query("SELECT * from foo");
-var_dump($r->fetch(SQLITE_ASSOC));
+var_dump($r->fetch_array(SQLITE_ASSOC));
?>
--EXPECT--
array(6) {
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_008.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_008.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_008.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_008.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_008.phpt:1.2 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_008.phpt Tue Mar 23 18:30:56 2004
@@ -22,7 +22,7 @@
}
$r = $db->query("SELECT a from strings");
-while ($row = $r->fetch(SQLITE_NUM)) {
+while ($row = $r->fetch_array(SQLITE_NUM)) {
var_dump($row);
}
echo "DONE!\n";
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_009.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_009.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.3 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_009.phpt Tue Mar 23 18:30:56 2004
@@ -21,8 +21,8 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$r = $db->unbufferedQuery("SELECT a from strings");
-while ($row = $r->fetch(SQLITE_NUM)) {
+$r = $db->unbuffered_query("SELECT a from strings");
+while ($row = $r->fetch_array(SQLITE_NUM)) {
var_dump($row);
}
echo "DONE!\n";
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_010.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_010.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.5
php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.6
--- php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.5 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_010.phpt Tue Mar 23 18:30:56 2004
@@ -21,7 +21,7 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
while ($row = $r->valid()) {
var_dump($r->current());
$r->next();
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_011.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_011.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_011.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_011.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_011.phpt:1.3 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_011.phpt Tue Mar 23 18:30:56 2004
@@ -14,7 +14,7 @@
$db->query("INSERT INTO foo VALUES ('1', '2', '3')");
$db->query("INSERT INTO bar VALUES ('4', '5', '6')");
$r = $db->query("SELECT * from foo, bar", SQLITE_ASSOC);
-var_dump($r->fetch());
+var_dump($r->fetch_array());
?>
--EXPECT--
array(6) {
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_012.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_012.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.3 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_012.phpt Tue Mar 23 18:30:56 2004
@@ -13,13 +13,13 @@
echo "Buffered\n";
$r = $db->query("SELECT * from strings");
-for($i=0; $i<$r->numFields(); $i++) {
- var_dump($r->fieldName($i));
+for($i=0; $i<$r->num_fields(); $i++) {
+ var_dump($r->field_name($i));
}
echo "Unbuffered\n";
-$r = $db->unbufferedQuery("SELECT * from strings");
-for($i=0; $i<$r->numFields(); $i++) {
- var_dump($r->fieldName($i));
+$r = $db->unbuffered_query("SELECT * from strings");
+for($i=0; $i<$r->num_fields(); $i++) {
+ var_dump($r->field_name($i));
}
echo "DONE!\n";
?>
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_013.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_013.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.5
php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.6
--- php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.5 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_013.phpt Tue Mar 23 18:30:56 2004
@@ -31,7 +31,7 @@
$r->next();
}
echo "====UNBUFFERED====\n";
-$r = $db->unbufferedQuery("SELECT a, b from strings");
+$r = $db->unbuffered_query("SELECT a, b from strings");
while ($r->valid()) {
var_dump($r->column(0));
var_dump($r->column('b'));
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_014.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_014.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.4 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_014.phpt Tue Mar 23 18:30:56 2004
@@ -22,20 +22,20 @@
}
echo "unbuffered twice\n";
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
-var_dump($r->fetchAll());
-var_dump($r->fetchAll());
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
+var_dump($r->fetch_all());
+var_dump($r->fetch_all());
echo "unbuffered with fetch_array\n";
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
-var_dump($r->fetch());
-var_dump($r->fetchAll());
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
+var_dump($r->fetch_array());
+var_dump($r->fetch_all());
echo "buffered\n";
$r = $db->query("SELECT a from strings", SQLITE_NUM);
-var_dump($r->fetchAll());
-var_dump($r->fetch());
-var_dump($r->fetchAll());
+var_dump($r->fetch_all());
+var_dump($r->fetch_array());
+var_dump($r->fetch_all());
echo "DONE!\n";
?>
@@ -59,7 +59,7 @@
}
}
-Notice: sqlite_ub_query::fetchAll(): One or more rowsets were already returned in
%ssqlite_oo_014.php on line %d
+Notice: sqlite_ub_query::fetch_all(): One or more rowsets were already returned in
%ssqlite_oo_014.php on line %d
array(0) {
}
unbuffered with fetch_array
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_015.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_015.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.3 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_015.phpt Tue Mar 23 18:30:56 2004
@@ -21,7 +21,7 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$res = $db->arrayQuery("SELECT a from strings", SQLITE_NUM);
+$res = $db->array_query("SELECT a from strings", SQLITE_NUM);
var_dump($res);
echo "DONE!\n";
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_016.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_016.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.7
php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.8
--- php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.7 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_016.phpt Tue Mar 23 18:30:56 2004
@@ -23,12 +23,12 @@
echo "====BUFFERED====\n";
$r = $db->query("SELECT a, b from strings");
while ($r->valid()) {
- var_dump($r->fetchSingle());
+ var_dump($r->fetch_single());
}
echo "====UNBUFFERED====\n";
-$r = $db->unbufferedQuery("SELECT a, b from strings");
+$r = $db->unbuffered_query("SELECT a, b from strings");
while ($r->valid()) {
- var_dump($r->fetchSingle());
+ var_dump($r->fetch_single());
}
echo "DONE!\n";
?>
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_020.phpt?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_020.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.8
php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.9
--- php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.8 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_020.phpt Tue Mar 23 18:30:56 2004
@@ -39,7 +39,7 @@
$db->query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')");
}
-$r = $db->unbufferedQuery("SELECT a, b from strings");
+$r = $db->unbuffered_query("SELECT a, b from strings");
while ($r->valid()) {
var_dump($r->current(SQLITE_NUM));
$r->next();
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_021.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_021.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.4 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_021.phpt Tue Mar 23 18:30:56 2004
@@ -13,13 +13,13 @@
}
$db->query("INSERT INTO test_db (data) VALUES(NULL)");
-var_dump($db->singleQuery("SELECT id FROM test_db WHERE id=5"));
-var_dump($db->singleQuery("SELECT * FROM test_db WHERE id=4"));
-var_dump($db->singleQuery("SELECT data FROM test_db WHERE id=6"));
-var_dump($db->singleQuery("SELECT * FROM test_db WHERE id < 5"));
-var_dump($db->singleQuery("SELECT * FROM test db WHERE id < 4"));
-var_dump($db->singleQuery("SELECT * FROM test_db WHERE id=999999"));
-var_dump($db->singleQuery("SELECT id FROM test_db WHERE id=5", FALSE));
+var_dump($db->single_query("SELECT id FROM test_db WHERE id=5"));
+var_dump($db->single_query("SELECT * FROM test_db WHERE id=4"));
+var_dump($db->single_query("SELECT data FROM test_db WHERE id=6"));
+var_dump($db->single_query("SELECT * FROM test_db WHERE id < 5"));
+var_dump($db->single_query("SELECT * FROM test db WHERE id < 4"));
+var_dump($db->single_query("SELECT * FROM test_db WHERE id=999999"));
+var_dump($db->single_query("SELECT id FROM test_db WHERE id=5", FALSE));
echo "DONE!\n";
?>
@@ -38,7 +38,7 @@
string(1) "4"
}
-Warning: sqlite_db::singleQuery(): no such table: test in %s on line %d
+Warning: sqlite_db::single_query(): no such table: test in %s on line %d
bool(false)
NULL
array(1) {
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_024.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_024.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.5
php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.6
--- php-src/ext/sqlite/tests/sqlite_oo_024.phpt:1.5 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_024.phpt Tue Mar 23 18:30:56 2004
@@ -30,13 +30,13 @@
echo "====class24====\n";
$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
while ($res->valid()) {
- var_dump($res->fetchObject('class24'));
+ var_dump($res->fetch_object('class24'));
}
echo "====stdclass====\n";
$res = $db->query("SELECT a FROM strings", SQLITE_ASSOC);
while ($res->valid()) {
- var_dump($res->fetchObject());
+ var_dump($res->fetch_object());
}
echo "====DONE!====\n";
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_025.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_025.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.4 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_025.phpt Tue Mar 23 18:30:56 2004
@@ -23,7 +23,7 @@
}
echo "====UNBUFFERED====\n";
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
//var_dump(class_implements($r));
foreach($r as $row) {
var_dump($row);
@@ -33,7 +33,7 @@
var_dump($row);
}
echo "====DIRECT====\n";
-foreach($db->unbufferedQuery("SELECT a from strings", SQLITE_NUM) as $row) {
+foreach($db->unbuffered_query("SELECT a from strings", SQLITE_NUM) as $row) {
var_dump($row);
}
echo "====BUFFERED====\n";
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_026.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_026.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.4 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_026.phpt Tue Mar 23 18:30:56 2004
@@ -23,13 +23,13 @@
}
echo "====FOREACH====\n";
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
foreach($r as $idx => $row) {
var_dump($row[0]);
var_dump($row[0]);
}
echo "====FOR====\n";
-$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbuffered_query("SELECT a from strings", SQLITE_NUM);
for(;$r->valid(); $r->next()) {
$v = $r->column(0);
var_dump($v);
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_028.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_028.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_028.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_028.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_028.phpt:1.2 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_028.phpt Tue Mar 23 18:30:56 2004
@@ -10,7 +10,7 @@
$db->query("CREATE TABLE strings(a, b INTEGER, c VARCHAR(10), d)");
$db->query("INSERT INTO strings VALUES('1', '2', '3', 'abc')");
-var_dump($db->fetchColumnTypes("strings"));
+var_dump($db->fetch_column_types("strings"));
?>
--EXPECT--
array(4) {
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_029.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_029.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.6
php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.7
--- php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.6 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_029.phpt Tue Mar 23 18:30:56 2004
@@ -13,14 +13,14 @@
class sqlite_help
{
- function __construct($db){
+ function sqlite_help($db){
$this->db = $db;
- $this->db->createFunction('link_keywords', array(&$this, 'linkers'),
1);
+ $this->db->create_function('link_keywords', array(&$this, 'linkers'),
1);
}
- function getSingle($key)
+ function get_single($key)
{
- return $this->db->singleQuery('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
+ return $this->db->single_query('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
}
function linkers($str)
@@ -41,7 +41,7 @@
}
$obj = new sqlite_help($db);
-echo $obj->getSingle('foo')."\n";
+echo $obj->get_single('foo')."\n";
$obj->free();
unset($obj);
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_030.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_030.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.4 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_030.phpt Tue Mar 23 18:30:56 2004
@@ -21,13 +21,13 @@
return $param;
}
-var_dump($db->singleQuery("select php('baz')", 1));
-var_dump($db->singleQuery("select php('baz', 1)", 1));
-var_dump($db->singleQuery("select php('baz', \"PHP\")", 1));
-var_dump($db->singleQuery("select php('foo::bar')", 1));
-var_dump($db->singleQuery("select php('foo::bar', 1)", 1));
-var_dump($db->singleQuery("select php('foo::bar', \"PHP\")", 1));
-var_dump($db->singleQuery("select php('foo::bar(\"PHP\")')", 1));
+var_dump($db->single_query("select php('baz')", 1));
+var_dump($db->single_query("select php('baz', 1)", 1));
+var_dump($db->single_query("select php('baz', \"PHP\")", 1));
+var_dump($db->single_query("select php('foo::bar')", 1));
+var_dump($db->single_query("select php('foo::bar', 1)", 1));
+var_dump($db->single_query("select php('foo::bar', \"PHP\")", 1));
+var_dump($db->single_query("select php('foo::bar(\"PHP\")')", 1));
?>
===DONE===
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_031.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_031.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.6
php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.7
--- php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.6 Tue Mar 23 03:48:36 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_031.phpt Tue Mar 23 18:30:56 2004
@@ -60,7 +60,7 @@
{
$this->db = $db;
$this->id_l = $id_l;
- $this->id_r = $this->db->singleQuery('SELECT id_r FROM menu WHERE
id_l='.$id_l, 1);
+ $this->id_r = $this->db->single_query('SELECT id_r FROM menu WHERE
id_l='.$id_l, 1);
$this->id = $id_l;
}
@@ -93,8 +93,8 @@
protected function fetch()
{
- $res = $this->db->unbufferedQuery('SELECT * FROM menu WHERE
id_l='.$this->id);
- $this->entry = $res->fetchObject('SqliteNestedsetElement',
array(&$this->db));
+ $res = $this->db->unbuffered_query('SELECT * FROM menu WHERE
id_l='.$this->id);
+ $this->entry = $res->fetch_object('SqliteNestedsetElement',
array(&$this->db));
unset($res);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
