Fix for r72150: rename getSchema() to getSchemaPath(). This terminology creates an...

diff --git a/includes/db/Database.php b/includes/db/Database.php
index c925b76..c1b3246 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -531,11 +531,11 @@ abstract class DatabaseBase implements DatabaseType {
        }
 
        /**
-        * Return a path to the DBMS-specific schema, otherwise default to tables.sql
+        * Return a path to the DBMS-specific schema file, otherwise default to tables.sql
         *
         * @return string
         */
-       public function getSchema() {
+       public function getSchemaPath() {
                global $IP;
                if ( file_exists( "$IP/maintenance/" . $this->getType() . "/tables.sql" ) ) {
                        return "$IP/maintenance/" . $this->getType() . "/tables.sql";

diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index a6778c3..aadd6b4 100644 (file)
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -157,7 +157,7 @@ abstract class DatabaseInstaller {
                $this->db->setFlag( DBO_DDLMODE ); // For Oracle's handling of schema files
                $this->db->begin( __METHOD__ );
 
-               $error = $this->db->sourceFile( $this->db->getSchema() );
+               $error = $this->db->sourceFile( $this->db->getSchemaPath() );
                if( $error !== true ) {
                        $this->db->reportQueryError( $error, 0, '', __METHOD__ );
                        $this->db->rollback( __METHOD__ );

diff --git a/includes/installer/Ibm_db2Installer.php b/includes/installer/Ibm_db2Installer.php
index 246d590..78e607f 100644 (file)
--- a/includes/installer/Ibm_db2Installer.php
+++ b/includes/installer/Ibm_db2Installer.php
@@ -185,7 +185,7 @@ class Ibm_db2Installer extends DatabaseInstaller {
                $this->db->setFlag( DBO_DDLMODE ); // For Oracle's handling of schema files
                $this->db->begin( __METHOD__ );
 
-               $error = $this->db->sourceFile( $this->db->getSchema() );
+               $error = $this->db->sourceFile( $this->db->getSchemaPath() );
                if( $error !== true ) {
                        $this->db->reportQueryError( $error, 0, '', __METHOD__ );
                        $this->db->rollback( __METHOD__ );

diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index fec928e..ea0e8d9 100644 (file)
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -543,7 +543,7 @@ class PostgresInstaller extends DatabaseInstaller {
                        $status->fatal( 'config-install-pg-schema-not-exist' );
                        return $status;
                }
-               $error = $conn->sourceFile( $conn->getSchema() );
+               $error = $conn->sourceFile( $conn->getSchemaPath() );
                if( $error !== true ) {
                        $conn->reportQueryError( $error, 0, '', __METHOD__ );
                        $conn->rollback( __METHOD__ );