From: Greg Sabino Mullane Date: Mon, 26 Jun 2006 23:38:50 +0000 (+0000) Subject: Begin cleaning up some of the PG naming. X-Git-Tag: 1.31.0-rc.0~56583 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=9319ff140caa1fac357356662e90bba702040afe;p=lhc%2Fweb%2Fwiklou.git Begin cleaning up some of the PG naming. --- diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 5d66ea9db1..d023303e55 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -30,8 +30,7 @@ function __autoload($className) { 'ResultWrapper' => 'Database.php', 'OracleBlob' => 'DatabaseOracle.php', 'DatabaseOracle' => 'DatabaseOracle.php', - 'DatabasePgsql' => 'DatabasePostgreSQL.php', - 'DatabasePostgreSQL' => 'DatabasePostgreSQL.php', + 'DatabasePostgres' => 'DatabasePostgres.php', 'DateFormatter' => 'DateFormatter.php', 'DifferenceEngine' => 'DifferenceEngine.php', '_DiffOp' => 'DifferenceEngine.php', diff --git a/includes/DatabasePostgreSQL.php b/includes/DatabasePostgreSQL.php index 23f82c25ae..7659473759 100644 --- a/includes/DatabasePostgreSQL.php +++ b/includes/DatabasePostgreSQL.php @@ -22,11 +22,11 @@ require_once( 'Database.php' ); * * @package MediaWiki */ -class DatabasePgsql extends Database { +class DatabasePostgres extends Database { var $mInsertId = NULL; var $mLastResult = NULL; - function DatabasePgsql($server = false, $user = false, $password = false, $dbName = false, + function DatabasePostgres($server = false, $user = false, $password = false, $dbName = false, $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) { Database::Database( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); @@ -35,7 +35,7 @@ class DatabasePgsql extends Database { /* static */ function newFromParams( $server = false, $user = false, $password = false, $dbName = false, $failFunction = false, $flags = 0, $tablePrefix = 'get from global' ) { - return new DatabasePgsql( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); + return new DatabasePostgres( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix ); } /** @@ -433,11 +433,4 @@ class DatabasePgsql extends Database { } } -/** - * Just an alias. - * @package MediaWiki - */ -class DatabasePostgreSQL extends DatabasePgsql { -} - ?>