[Fusionforge-commits] r15789 - in branches/Branch_5_2: . src/plugins/mediawiki/www
Roland Mas
lolando at fusionforge.org
Thu Jun 14 16:24:54 CEST 2012
Author: lolando
Date: 2012-06-14 16:24:54 +0200 (Thu, 14 Jun 2012)
New Revision: 15789
Modified:
branches/Branch_5_2/
branches/Branch_5_2/src/plugins/mediawiki/www/DatabaseForgePgsql.php
branches/Branch_5_2/src/plugins/mediawiki/www/LocalSettings.php
Log:
Moved DatabaseForge class declaration to its dedicated file
Modified: branches/Branch_5_2/src/plugins/mediawiki/www/DatabaseForgePgsql.php
===================================================================
--- branches/Branch_5_2/src/plugins/mediawiki/www/DatabaseForgePgsql.php 2012-06-14 14:24:48 UTC (rev 15788)
+++ branches/Branch_5_2/src/plugins/mediawiki/www/DatabaseForgePgsql.php 2012-06-14 14:24:54 UTC (rev 15789)
@@ -21,23 +21,70 @@
*/
require_once("$IP/includes/db/DatabasePostgres.php");
-class DatabaseForge extends DataBasePostgres{
- function DatabaseForge($server=false, $user=false, $password=false,
- $dbName=false, $failFunction=false, $flags=0) {
+class DatabaseForge extends DatabasePostgres {
+ function __construct($server=false, $user=false, $password=false,
+ $dbName=false, $failFunction=false, $flags=0) {
global $wgDBtype;
$wgDBtype = "postgres";
- return DatabasePostgres::DatabasePostgres($server, $user,
- $password, $dbName, $failFunction, $flags);
+ return parent::__construct($server, $user,
+ $password, $dbName, $failFunction, $flags);
}
- function tableName($name) {
+ function fieldInfo($table, $field) {
+ switch ($table) {
+ case 'interwiki':
+ break;
+ default:
+ return DatabasePostgres::fieldInfo($table, $field);
+ }
+
+ global $wgDBmwschema;
+
+ $save_wgDBmwschema = $wgDBmwschema;
+ $wgDBmwschema = 'public';
+ $v = DatabasePostgres::fieldInfo($table, $field);
+ $wgDBmwschema = $save_wgDBmwschema;
+ return $v;
+ }
+
+ function open($server, $user, $password, $dbName) {
+ $v = DatabasePostgres::open($server, $user, $password, $dbName);
+
+ global $wgDBmwschema;
+ if ($this->schemaExists($wgDBmwschema)) {
+ $safeschema = $this->addIdentifierQuotes($wgDBmwschema);
+ $this->doQuery("SET search_path TO $safeschema,public");
+ }
+
+ return $v;
+ }
+
+ function query($sql, $fname='', $tempIgnore=false) {
+ /* ugh! */
+ $chk = "ALTER TABLE interwiki ";
+ $csz = strlen($chk);
+ if (substr($sql, 0, $csz) == $chk) {
+ $sql = "ALTER TABLE public.interwiki " .
+ substr($sql, $csz);
+ }
+ return DatabasePostgres::query($sql, $fname,$tempIgnore);
+ }
+
+ function tableName($name, $format='quoted') {
+ global $wgDBmwschema;
+
switch ($name) {
case 'interwiki':
- return 'public.plugin_mediawiki_interwiki';
+ $v = 'interwiki';
default:
- return DatabasePostgres::tableName($name);
+ return DatabasePostgres::tableName($name, $format);
}
+
+ if ($wgDBmwschema != 'public') {
+ $v = 'public.' . $v;
+ }
+ return $v;
}
}
Modified: branches/Branch_5_2/src/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- branches/Branch_5_2/src/plugins/mediawiki/www/LocalSettings.php 2012-06-14 14:24:48 UTC (rev 15788)
+++ branches/Branch_5_2/src/plugins/mediawiki/www/LocalSettings.php 2012-06-14 14:24:54 UTC (rev 15789)
@@ -77,73 +77,6 @@
}
}
-class DatabaseForge extends DatabasePostgres {
- function __construct($server=false, $user=false, $password=false,
- $dbName=false, $failFunction=false, $flags=0) {
- global $wgDBtype;
-
- $wgDBtype = "postgres";
- return parent::__construct($server, $user,
- $password, $dbName, $failFunction, $flags);
- }
-
- function fieldInfo($table, $field) {
- switch ($table) {
- case 'interwiki':
- break;
- default:
- return DatabasePostgres::fieldInfo($table, $field);
- }
-
- global $wgDBmwschema;
-
- $save_wgDBmwschema = $wgDBmwschema;
- $wgDBmwschema = 'public';
- $v = DatabasePostgres::fieldInfo($table, $field);
- $wgDBmwschema = $save_wgDBmwschema;
- return $v;
- }
-
- function open($server, $user, $password, $dbName) {
- $v = DatabasePostgres::open($server, $user, $password, $dbName);
-
- global $wgDBmwschema;
- if ($this->schemaExists($wgDBmwschema)) {
- $safeschema = $this->addIdentifierQuotes($wgDBmwschema);
- $this->doQuery("SET search_path TO $safeschema,public");
- }
-
- return $v;
- }
-
- function query($sql, $fname='', $tempIgnore=false) {
- /* ugh! */
- $chk = "ALTER TABLE interwiki ";
- $csz = strlen($chk);
- if (substr($sql, 0, $csz) == $chk) {
- $sql = "ALTER TABLE public.interwiki " .
- substr($sql, $csz);
- }
- return DatabasePostgres::query($sql, $fname,$tempIgnore);
- }
-
- function tableName($name, $format='quoted') {
- global $wgDBmwschema;
-
- switch ($name) {
- case 'interwiki':
- $v = 'interwiki';
- default:
- return DatabasePostgres::tableName($name, $format);
- }
-
- if ($wgDBmwschema != 'public') {
- $v = 'public.' . $v;
- }
- return $v;
- }
-}
-
$g = group_get_object_by_name($fusionforgeproject) ;
$wgSitename = $g->getPublicName() . " Wiki";
$wgScriptPath = "/plugins/mediawiki/wiki/$fusionforgeproject" ;
More information about the Fusionforge-commits
mailing list