Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Consitency rules

PEAR_1_4DEV
Marcus Boerger 23 years ago
parent
e6a1f04677
commit
82e2b354ac
15 changed files with 34 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ext/sqlite/sqlite.c
  2. 2
      ext/sqlite/tests/sqlite_oo_009.phpt
  3. 2
      ext/sqlite/tests/sqlite_oo_010.phpt
  4. 2
      ext/sqlite/tests/sqlite_oo_012.phpt
  5. 2
      ext/sqlite/tests/sqlite_oo_013.phpt
  6. 4
      ext/sqlite/tests/sqlite_oo_014.phpt
  7. 2
      ext/sqlite/tests/sqlite_oo_015.phpt
  8. 2
      ext/sqlite/tests/sqlite_oo_016.phpt
  9. 2
      ext/sqlite/tests/sqlite_oo_020.phpt
  10. 16
      ext/sqlite/tests/sqlite_oo_021.phpt
  11. 4
      ext/sqlite/tests/sqlite_oo_025.phpt
  12. 4
      ext/sqlite/tests/sqlite_oo_026.phpt
  13. 2
      ext/sqlite/tests/sqlite_oo_029.phpt
  14. 14
      ext/sqlite/tests/sqlite_oo_030.phpt
  15. 4
      ext/sqlite/tests/sqlite_oo_031.phpt

6
ext/sqlite/sqlite.c
View File

@ -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)

2
ext/sqlite/tests/sqlite_oo_009.phpt
View File

@ -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);
}

2
ext/sqlite/tests/sqlite_oo_010.phpt
View File

@ -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();

2
ext/sqlite/tests/sqlite_oo_012.phpt
View File

@ -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));
}

2
ext/sqlite/tests/sqlite_oo_013.phpt
View File

@ -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'));

4
ext/sqlite/tests/sqlite_oo_014.phpt
View File

@ -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());

2
ext/sqlite/tests/sqlite_oo_015.phpt
View File

@ -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";

2
ext/sqlite/tests/sqlite_oo_016.phpt
View File

@ -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());
}

2
ext/sqlite/tests/sqlite_oo_020.phpt
View File

@ -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();

16
ext/sqlite/tests/sqlite_oo_021.phpt
View File

@ -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) {

4
ext/sqlite/tests/sqlite_oo_025.phpt
View File

@ -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";

4
ext/sqlite/tests/sqlite_oo_026.phpt
View File

@ -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);

2
ext/sqlite/tests/sqlite_oo_029.phpt
View File

@ -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)

14
ext/sqlite/tests/sqlite_oo_030.phpt
View File

@ -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===

4
ext/sqlite/tests/sqlite_oo_031.phpt
View File

@ -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);
}

Write Preview
Loading…
Cancel
Save