Consitency rules

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index a68aafcb752c919dd1b1f3ac21fdb76814625848..cb5b8da51b4fbd731e680ebc37494307c6f553e6 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -192,9 +192,9 @@ function_entry sqlite_funcs_db[] = {
        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)

diff --git a/ext/sqlite/tests/sqlite_oo_009.phpt b/ext/sqlite/tests/sqlite_oo_009.phpt
index 87355f7faaecc8c855b1592f8c687a46f83d6e7f..c2a55556c1ba3a25cb66364afe1169823e7d5057 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_009.phpt
+++ b/ext/sqlite/tests/sqlite_oo_009.phpt
@@ -21,7 +21,7 @@ foreach ($data as $str) {
        $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);
 }

diff --git a/ext/sqlite/tests/sqlite_oo_010.phpt b/ext/sqlite/tests/sqlite_oo_010.phpt
index b7f53cd4ad4f5b14f4053b6300b9b4ee93253d74..8d6f3c0a99279e9485f29020b02abd28fe29a4ee 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_010.phpt
+++ b/ext/sqlite/tests/sqlite_oo_010.phpt
@@ -21,7 +21,7 @@ foreach ($data as $str) {
        $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();

diff --git a/ext/sqlite/tests/sqlite_oo_012.phpt b/ext/sqlite/tests/sqlite_oo_012.phpt
index 0d307e1cd72ee3a4a8b1f7d2ab9a16f06f6acdd1..408feb9d174b8bfd79014173fbd16362823201d8 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_012.phpt
+++ b/ext/sqlite/tests/sqlite_oo_012.phpt
@@ -17,7 +17,7 @@ for($i=0; $i<$r->numFields(); $i++) {
        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));
 }

diff --git a/ext/sqlite/tests/sqlite_oo_013.phpt b/ext/sqlite/tests/sqlite_oo_013.phpt
index dfb2f5c4953b9e18f0bebb927c8469e15f048d30..0c19505f2330abc1e8108926938d5850430bd7b0 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_013.phpt
+++ b/ext/sqlite/tests/sqlite_oo_013.phpt
@@ -31,7 +31,7 @@ while ($r->valid()) {
        $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'));

diff --git a/ext/sqlite/tests/sqlite_oo_014.phpt b/ext/sqlite/tests/sqlite_oo_014.phpt
index 022de10752fedfff41faec7c20210b9b19d1fdd6..e650b7143246a168be6b001ac424383cd35b7a93 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_014.phpt
+++ b/ext/sqlite/tests/sqlite_oo_014.phpt
@@ -22,12 +22,12 @@ foreach ($data as $str) {
 }
 
 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());
 

diff --git a/ext/sqlite/tests/sqlite_oo_015.phpt b/ext/sqlite/tests/sqlite_oo_015.phpt
index 4eb340602cd54763d41724f856237490733250f5..893e6f14abfaa49e421cfccca59972aa7774f2af 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_015.phpt
+++ b/ext/sqlite/tests/sqlite_oo_015.phpt
@@ -21,7 +21,7 @@ foreach ($data as $str) {
        $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";

diff --git a/ext/sqlite/tests/sqlite_oo_016.phpt b/ext/sqlite/tests/sqlite_oo_016.phpt
index fbfbc0f5de0f737673024d2b12f5135a6c2cd6c5..d831b48326de6059200f174234ec5f1938d9c7e5 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_016.phpt
+++ b/ext/sqlite/tests/sqlite_oo_016.phpt
@@ -26,7 +26,7 @@ while ($r->valid()) {
        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());
 }

diff --git a/ext/sqlite/tests/sqlite_oo_020.phpt b/ext/sqlite/tests/sqlite_oo_020.phpt
index d0936ec6b1fe95ebbea4fd5d3dc1cfaf1dec11cb..fc288b65b6cbd3ba9e7f4d4c1b717fbad87eaff9 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_020.phpt
+++ b/ext/sqlite/tests/sqlite_oo_020.phpt
@@ -39,7 +39,7 @@ foreach ($data as $str) {
        $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();

diff --git a/ext/sqlite/tests/sqlite_oo_021.phpt b/ext/sqlite/tests/sqlite_oo_021.phpt
index 6b90eea0dc5df9c8545ba94f8dba69111625327d..339e460e21524ae7905b75616b83bbf184590281 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_021.phpt
+++ b/ext/sqlite/tests/sqlite_oo_021.phpt
@@ -13,13 +13,13 @@ for ($i = 0; $i < 10; $i++) {
 }
 $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 @@ array(4) {
   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) {

diff --git a/ext/sqlite/tests/sqlite_oo_025.phpt b/ext/sqlite/tests/sqlite_oo_025.phpt
index 98987bedc6176a812429f23b377be100acf95086..3cb42d764746bbb60014191d33a13677e9dbbd93 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_025.phpt
+++ b/ext/sqlite/tests/sqlite_oo_025.phpt
@@ -23,7 +23,7 @@ foreach ($data as $str) {
 }
 
 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 @@ foreach($r as $row) {
        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";

diff --git a/ext/sqlite/tests/sqlite_oo_026.phpt b/ext/sqlite/tests/sqlite_oo_026.phpt
index 770dd7616600efe093370e76361eb14ce1d54757..4beacbb8880425eeff68967ffe37d13948a65332 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_026.phpt
+++ b/ext/sqlite/tests/sqlite_oo_026.phpt
@@ -23,13 +23,13 @@ foreach ($data as $str) {
 }
 
 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);

diff --git a/ext/sqlite/tests/sqlite_oo_029.phpt b/ext/sqlite/tests/sqlite_oo_029.phpt
index 83de67a4174ce3af4b6134aff656af45833a6208..4b2b1992b8e2c74e50ebf18b4030c6a2c417c3aa 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_029.phpt
+++ b/ext/sqlite/tests/sqlite_oo_029.phpt
@@ -20,7 +20,7 @@ class sqlite_help
 
        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)

diff --git a/ext/sqlite/tests/sqlite_oo_030.phpt b/ext/sqlite/tests/sqlite_oo_030.phpt
index d42a38f1cdab3b7fb2692735fc26d7a129022e46..2155115974d78ff5ea9fab864273a6fb35632a8b 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_030.phpt
+++ b/ext/sqlite/tests/sqlite_oo_030.phpt
@@ -21,13 +21,13 @@ function baz($param = NULL) {
        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===

diff --git a/ext/sqlite/tests/sqlite_oo_031.phpt b/ext/sqlite/tests/sqlite_oo_031.phpt
index ab96fb6f0ef06c20dc326274c620ae2633b3e5eb..f0ed40a425ab1d9adfb8646258ee6f4e63035719 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_031.phpt
+++ b/ext/sqlite/tests/sqlite_oo_031.phpt
@@ -60,7 +60,7 @@ class SqliteNestedset implements RecursiveIterator
        {
                $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 @@ class SqliteNestedset implements RecursiveIterator
 
        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);
        }