helly Tue Mar 23 03:48:36 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite/tests sqlite_oo_009.phpt sqlite_oo_010.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_025.phpt
sqlite_oo_026.phpt sqlite_oo_029.phpt
sqlite_oo_030.phpt sqlite_oo_031.phpt
Log:
Consitency rules
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.133&r2=1.134&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.133 php-src/ext/sqlite/sqlite.c:1.134
--- php-src/ext/sqlite/sqlite.c:1.133 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/sqlite.c Tue Mar 23 03:48:35 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.133 2004/03/23 08:03:10 helly Exp $
+ $Id: sqlite.c,v 1.134 2004/03/23 08:48:35 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -192,9 +192,9 @@
PHP_ME_MAPPING(__construct, sqlite_open, NULL)
/* PHP_ME_MAPPING(close, sqlite_close, NULL)*/
PHP_ME_MAPPING(query, sqlite_query, NULL)
- PHP_ME_MAPPING(queryAll, sqlite_array_query, NULL)
- PHP_ME_MAPPING(querySingle, sqlite_single_query, NULL)
- PHP_ME_MAPPING(queryUnbuffered, sqlite_unbuffered_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(changes, sqlite_changes, NULL)
PHP_ME_MAPPING(createAggregate, sqlite_create_aggregate, 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.133 2004/03/23 08:03:10 helly Exp $");
+ 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, "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_009.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_009.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_009.phpt:1.2 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_009.phpt Tue Mar 23 03:48:36 2004
@@ -21,7 +21,7 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$r = $db->queryUnbuffered("SELECT a from strings");
+$r = $db->unbufferedQuery("SELECT a from strings");
while ($row = $r->fetch(SQLITE_NUM)) {
var_dump($row);
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_010.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_010.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_010.phpt:1.4 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_010.phpt Tue Mar 23 03:48:36 2004
@@ -21,7 +21,7 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("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_012.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_012.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_012.phpt:1.2 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_012.phpt Tue Mar 23 03:48:36 2004
@@ -17,7 +17,7 @@
var_dump($r->fieldName($i));
}
echo "Unbuffered\n";
-$r = $db->queryUnbuffered("SELECT * from strings");
+$r = $db->unbufferedQuery("SELECT * from strings");
for($i=0; $i<$r->numFields(); $i++) {
var_dump($r->fieldName($i));
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_013.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_013.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.4
php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.5
--- php-src/ext/sqlite/tests/sqlite_oo_013.phpt:1.4 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_013.phpt Tue Mar 23 03:48:36 2004
@@ -31,7 +31,7 @@
$r->next();
}
echo "====UNBUFFERED====\n";
-$r = $db->queryUnbuffered("SELECT a, b from strings");
+$r = $db->unbufferedQuery("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.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_014.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.3 Tue Mar 23 03:03:10 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_014.phpt Tue Mar 23 03:48:36 2004
@@ -22,12 +22,12 @@
}
echo "unbuffered twice\n";
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
var_dump($r->fetchAll());
var_dump($r->fetchAll());
echo "unbuffered with fetch_array\n";
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
var_dump($r->fetch());
var_dump($r->fetchAll());
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_015.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_015.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.2
php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.3
--- php-src/ext/sqlite/tests/sqlite_oo_015.phpt:1.2 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_015.phpt Tue Mar 23 03:48:36 2004
@@ -21,7 +21,7 @@
$db->query("INSERT INTO strings VALUES('$str')");
}
-$res = $db->queryAll("SELECT a from strings", SQLITE_NUM);
+$res = $db->arrayQuery("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.6&r2=1.7&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_016.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.6
php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.7
--- php-src/ext/sqlite/tests/sqlite_oo_016.phpt:1.6 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_016.phpt Tue Mar 23 03:48:36 2004
@@ -26,7 +26,7 @@
var_dump($r->fetchSingle());
}
echo "====UNBUFFERED====\n";
-$r = $db->queryUnbuffered("SELECT a, b from strings");
+$r = $db->unbufferedQuery("SELECT a, b from strings");
while ($r->valid()) {
var_dump($r->fetchSingle());
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_020.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_020.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.7
php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.8
--- php-src/ext/sqlite/tests/sqlite_oo_020.phpt:1.7 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_020.phpt Tue Mar 23 03:48:36 2004
@@ -39,7 +39,7 @@
$db->query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')");
}
-$r = $db->queryUnbuffered("SELECT a, b from strings");
+$r = $db->unbufferedQuery("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.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_021.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_021.phpt:1.3 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_021.phpt Tue Mar 23 03:48:36 2004
@@ -13,13 +13,13 @@
}
$db->query("INSERT INTO test_db (data) VALUES(NULL)");
-var_dump($db->querySingle("SELECT id FROM test_db WHERE id=5"));
-var_dump($db->querySingle("SELECT * FROM test_db WHERE id=4"));
-var_dump($db->querySingle("SELECT data FROM test_db WHERE id=6"));
-var_dump($db->querySingle("SELECT * FROM test_db WHERE id < 5"));
-var_dump($db->querySingle("SELECT * FROM test db WHERE id < 4"));
-var_dump($db->querySingle("SELECT * FROM test_db WHERE id=999999"));
-var_dump($db->querySingle("SELECT id FROM test_db WHERE id=5", FALSE));
+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));
echo "DONE!\n";
?>
@@ -38,7 +38,7 @@
string(1) "4"
}
-Warning: sqlite_db::querySingle(): no such table: test in %s on line %d
+Warning: sqlite_db::singleQuery(): 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_025.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_025.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_025.phpt:1.3 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_025.phpt Tue Mar 23 03:48:36 2004
@@ -23,7 +23,7 @@
}
echo "====UNBUFFERED====\n";
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("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->queryUnbuffered("SELECT a from strings", SQLITE_NUM) as $row) {
+foreach($db->unbufferedQuery("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.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_026.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_026.phpt:1.3 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_026.phpt Tue Mar 23 03:48:36 2004
@@ -23,13 +23,13 @@
}
echo "====FOREACH====\n";
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("SELECT a from strings", SQLITE_NUM);
foreach($r as $idx => $row) {
var_dump($row[0]);
var_dump($row[0]);
}
echo "====FOR====\n";
-$r = $db->queryUnbuffered("SELECT a from strings", SQLITE_NUM);
+$r = $db->unbufferedQuery("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_029.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_029.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.5
php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.6
--- php-src/ext/sqlite/tests/sqlite_oo_029.phpt:1.5 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_029.phpt Tue Mar 23 03:48:36 2004
@@ -20,7 +20,7 @@
function getSingle($key)
{
- return $this->db->querySingle('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
+ return $this->db->singleQuery('SELECT link_keywords(var) FROM strings
WHERE key=\''.$key.'\'', 1);
}
function linkers($str)
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_030.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_030.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.3
php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.3 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_030.phpt Tue Mar 23 03:48:36 2004
@@ -21,13 +21,13 @@
return $param;
}
-var_dump($db->querySingle("select php('baz')", 1));
-var_dump($db->querySingle("select php('baz', 1)", 1));
-var_dump($db->querySingle("select php('baz', \"PHP\")", 1));
-var_dump($db->querySingle("select php('foo::bar')", 1));
-var_dump($db->querySingle("select php('foo::bar', 1)", 1));
-var_dump($db->querySingle("select php('foo::bar', \"PHP\")", 1));
-var_dump($db->querySingle("select php('foo::bar(\"PHP\")')", 1));
+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));
?>
===DONE===
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_031.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_031.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.5
php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.6
--- php-src/ext/sqlite/tests/sqlite_oo_031.phpt:1.5 Tue Mar 23 03:03:11 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_031.phpt Tue Mar 23 03:48:36 2004
@@ -60,7 +60,7 @@
{
$this->db = $db;
$this->id_l = $id_l;
- $this->id_r = $this->db->querySingle('SELECT id_r FROM menu WHERE
id_l='.$id_l, 1);
+ $this->id_r = $this->db->singleQuery('SELECT id_r FROM menu WHERE
id_l='.$id_l, 1);
$this->id = $id_l;
}
@@ -93,7 +93,7 @@
protected function fetch()
{
- $res = $this->db->queryUnbuffered('SELECT * FROM menu WHERE
id_l='.$this->id);
+ $res = $this->db->unbufferedQuery('SELECT * FROM menu WHERE
id_l='.$this->id);
$this->entry = $res->fetchObject('SqliteNestedsetElement',
array(&$this->db));
unset($res);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
