dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca0e1a0
)
Changed doQuery() -> query()
author
Aaron Schulz
<aaron@users.mediawiki.org>
Wed, 15 Dec 2010 20:59:29 +0000
(20:59 +0000)
committer
Aaron Schulz
<aaron@users.mediawiki.org>
Wed, 15 Dec 2010 20:59:29 +0000
(20:59 +0000)
includes/installer/OracleInstaller.php
patch
|
blob
|
history
includes/installer/OracleUpdater.php
patch
|
blob
|
history
includes/installer/PostgresInstaller.php
patch
|
blob
|
history
includes/installer/PostgresUpdater.php
patch
|
blob
|
history
includes/search/SearchPostgres.php
patch
|
blob
|
history
diff --git
a/includes/installer/OracleInstaller.php
b/includes/installer/OracleInstaller.php
index
d9bc098
..
feb7e72
100644
(file)
--- a/
includes/installer/OracleInstaller.php
+++ b/
includes/installer/OracleInstaller.php
@@
-195,7
+195,7
@@
class OracleInstaller extends DatabaseInstaller {
public function createTables() {
$status = parent::createTables();
public function createTables() {
$status = parent::createTables();
- $this->db->
doQ
uery( 'BEGIN fill_wiki_info; END;' );
+ $this->db->
q
uery( 'BEGIN fill_wiki_info; END;' );
return $status;
}
return $status;
}
diff --git
a/includes/installer/OracleUpdater.php
b/includes/installer/OracleUpdater.php
index
df46ba3
..
a60c668
100644
(file)
--- a/
includes/installer/OracleUpdater.php
+++ b/
includes/installer/OracleUpdater.php
@@
-93,7
+93,7
@@
class OracleUpdater extends DatabaseUpdater {
public function doUpdates( $purge = true ) {
parent::doUpdates();
public function doUpdates( $purge = true ) {
parent::doUpdates();
- $this->db->
doQ
uery( 'BEGIN fill_wiki_info; END;' );
+ $this->db->
q
uery( 'BEGIN fill_wiki_info; END;' );
}
}
}
}
diff --git
a/includes/installer/PostgresInstaller.php
b/includes/installer/PostgresInstaller.php
index
9d832f9
..
72e94e9
100644
(file)
--- a/
includes/installer/PostgresInstaller.php
+++ b/
includes/installer/PostgresInstaller.php
@@
-129,14
+129,14
@@
class PostgresInstaller extends DatabaseInstaller {
$ctest = 'mediawiki_test_table';
$safeschema = $conn->addIdentifierQuotes( $schema );
if ( $conn->tableExists( $ctest, $schema ) ) {
$ctest = 'mediawiki_test_table';
$safeschema = $conn->addIdentifierQuotes( $schema );
if ( $conn->tableExists( $ctest, $schema ) ) {
- $conn->
doQ
uery( "DROP TABLE $safeschema.$ctest" );
+ $conn->
q
uery( "DROP TABLE $safeschema.$ctest" );
}
}
- $res = $conn->
doQ
uery( "CREATE TABLE $safeschema.$ctest(a int)" );
+ $res = $conn->
q
uery( "CREATE TABLE $safeschema.$ctest(a int)" );
if ( !$res ) {
$status->fatal( 'config-install-pg-schema-failed',
$this->getVar( 'wgDBuser'), $schema );
}
if ( !$res ) {
$status->fatal( 'config-install-pg-schema-failed',
$this->getVar( 'wgDBuser'), $schema );
}
- $conn->
doQ
uery( "DROP TABLE $safeschema.$ctest" );
+ $conn->
q
uery( "DROP TABLE $safeschema.$ctest" );
return $status;
}
return $status;
}
diff --git
a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index
c6abcc3
..
629ccba
100644
(file)
--- a/
includes/installer/PostgresUpdater.php
+++ b/
includes/installer/PostgresUpdater.php
@@
-523,7
+523,7
@@
END;
$safeuser = $this->db->addQuotes( $wgDBuser );
$SQL = "SELECT array_to_string(useconfig,'*') FROM pg_catalog.pg_user WHERE usename = $safeuser";
$safeuser = $this->db->addQuotes( $wgDBuser );
$SQL = "SELECT array_to_string(useconfig,'*') FROM pg_catalog.pg_user WHERE usename = $safeuser";
- $config = pg_fetch_result( $this->db->
doQ
uery( $SQL ), 0, 0 );
+ $config = pg_fetch_result( $this->db->
q
uery( $SQL ), 0, 0 );
$conf = array();
foreach ( explode( '*', $config ) as $c ) {
list( $x, $y ) = explode( '=', $c );
$conf = array();
foreach ( explode( '*', $config ) as $c ) {
list( $x, $y ) = explode( '=', $c );
@@
-546,8
+546,8
@@
END;
}
$search_path = str_replace( ', ,', ',', $search_path );
if ( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
}
$search_path = str_replace( ', ,', ',', $search_path );
if ( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
- $this->db->
doQ
uery( "ALTER USER $wgDBuser SET search_path = $search_path" );
- $this->db->
doQ
uery( "SET search_path = $search_path" );
+ $this->db->
q
uery( "ALTER USER $wgDBuser SET search_path = $search_path" );
+ $this->db->
q
uery( "SET search_path = $search_path" );
} else {
$path = $conf['search_path'];
$this->output( "... search_path for user \"$wgDBuser\" looks correct ($path)\n" );
} else {
$path = $conf['search_path'];
$this->output( "... search_path for user \"$wgDBuser\" looks correct ($path)\n" );
@@
-562,8
+562,8
@@
END;
foreach ( $goodconf as $key => $value ) {
if ( !array_key_exists( $key, $conf ) or $conf[$key] !== $value ) {
$this->output( "Setting $key to '$value' for user \"$wgDBuser\"\n" );
foreach ( $goodconf as $key => $value ) {
if ( !array_key_exists( $key, $conf ) or $conf[$key] !== $value ) {
$this->output( "Setting $key to '$value' for user \"$wgDBuser\"\n" );
- $this->db->
doQ
uery( "ALTER USER $wgDBuser SET $key = '$value'" );
- $this->db->
doQ
uery( "SET $key = '$value'" );
+ $this->db->
q
uery( "ALTER USER $wgDBuser SET $key = '$value'" );
+ $this->db->
q
uery( "SET $key = '$value'" );
} else {
$this->output( "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n" );
}
} else {
$this->output( "... default value of \"$key\" is correctly set to \"$value\" for user \"$wgDBuser\"\n" );
}
diff --git
a/includes/search/SearchPostgres.php
b/includes/search/SearchPostgres.php
index
8c9e293
..
9d6d153
100644
(file)
--- a/
includes/search/SearchPostgres.php
+++ b/
includes/search/SearchPostgres.php
@@
-148,7
+148,7
@@
class SearchPostgres extends SearchEngine {
## We need a separate query here so gin does not complain about empty searches
$SQL = "SELECT to_tsquery($prefix $searchstring)";
## We need a separate query here so gin does not complain about empty searches
$SQL = "SELECT to_tsquery($prefix $searchstring)";
- $res = $this->db->
doQ
uery($SQL);
+ $res = $this->db->
q
uery($SQL);
if (!$res) {
## TODO: Better output (example to catch: one 'two)
die ("Sorry, that was not a valid search string. Please go back and try again");
if (!$res) {
## TODO: Better output (example to catch: one 'two)
die ("Sorry, that was not a valid search string. Please go back and try again");
@@
-206,7
+206,7
@@
class SearchPostgres extends SearchEngine {
$SQL = "UPDATE pagecontent SET textvector = NULL WHERE old_id IN ".
"(SELECT rev_text_id FROM revision WHERE rev_page = " . intval( $pageid ) .
" ORDER BY rev_text_id DESC OFFSET 1)";
$SQL = "UPDATE pagecontent SET textvector = NULL WHERE old_id IN ".
"(SELECT rev_text_id FROM revision WHERE rev_page = " . intval( $pageid ) .
" ORDER BY rev_text_id DESC OFFSET 1)";
- $this->db->
doQ
uery($SQL);
+ $this->db->
q
uery($SQL);
return true;
}
return true;
}