Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move createTables() up a level, this code was practically identical

Browse source
This commit is contained in:
Chad Horohoe 2010-09-01 19:03:56 +00:00
parent 21216bd52d
commit ed7ff76d50
6 changed files with 34 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/db/Database.php
View file

@ -276,6 +276,18 @@ abstract class DatabaseBase implements DatabaseType {
}
}
/**
* Return a path to the DBMS-specific schema, otherwise default to tables.sql
*/
public function getSchema() {
global $IP;
if ( file_exists( "$IP/maintenance/" . $this->getType() . "/tables.sql" ) ) {
return "$IP/maintenance/" . $this->getType() . "/tables.sql";
} else {
return "$IP/maintenance/tables.sql";
}
}
#------------------------------------------------------------------------------
# Other functions
#------------------------------------------------------------------------------

20
includes/installer/DatabaseInstaller.php
View file

@ -116,7 +116,25 @@ abstract class DatabaseInstaller {
*
* @return Status
*/
public abstract function createTables();
public function createTables() {
$status = $this->getConnection();
if ( !$status->isOK() ) {
return $status;
}
$this->db->selectDB( $this->getVar( 'wgDBname' ) );
if( $this->db->tableExists( 'user' ) ) {
$status->warning( 'config-install-tables-exist' );
return $status;
}
$error = $this->db->sourceFile( $this->db->getSchema() );
if( $error !== true ) {
$this->db->reportQueryError( $error, 0, $sql, __METHOD__ );
$status->fatal( 'config-install-tables-failed', $error );
}
return $status;
}
/**
* Get the DBMS-specific options for LocalSettings.php generation.

20
includes/installer/MysqlInstaller.php
View file

@ -466,26 +466,6 @@ class MysqlInstaller extends DatabaseInstaller {
return $status;
}
public function createTables() {
global $IP;
$status = $this->getConnection();
if ( !$status->isOK() ) {
return $status;
}
$this->db->selectDB( $this->getVar( 'wgDBname' ) );
if( $this->db->tableExists( 'user' ) ) {
$status->warning( 'config-install-tables-exist' );
return $status;
}
$error = $this->db->sourceFile( "$IP/maintenance/tables.sql" );
if( $error !== true ) {
$status->fatal( 'config-install-tables-failed', $error );
}
return $status;
}
public function getTableOptions() {
return array( 'engine' => $this->getVar( '_MysqlEngine' ),
'default charset' => $this->getVar( '_MysqlCharset' ) );

4
includes/installer/OracleInstaller.php
View file

@ -96,10 +96,6 @@ class OracleInstaller extends DatabaseInstaller {
// TODO
}
public function createTables() {
// TODO
}
public function getLocalSettings() {
$prefix = $this->getVar( 'wgDBprefix' );
return

16
includes/installer/PostgresInstaller.php
View file

@ -115,22 +115,6 @@ class PostgresInstaller extends DatabaseInstaller {
function setupDatabase() {
}
function createTables() {
$status = $this->getConnection();
if ( !$status->isOK() ) {
return $status;
}
$this->db->selectDB( $this->getVar( 'wgDBname' ) );
global $IP;
$err = $this->db->sourceFile( "$IP/maintenance/postgres/tables.sql" );
if ( $err !== true ) {
//@todo or...?
$this->db->reportQueryError( $err, 0, $sql, __FUNCTION__ );
}
return Status::newGood();
}
function getLocalSettings() {
$port = $this->getVar( 'wgDBport' );
$schema = $this->getVar( 'wgDBmwschema' );

18
includes/installer/SqliteInstaller.php
View file

@ -151,25 +151,13 @@ class SqliteInstaller extends DatabaseInstaller {
}
public function createTables() {
global $IP;
$status = $this->getConnection();
if ( !$status->isOK() ) {
return $status;
}
// Process common MySQL/SQLite table definitions
$err = $this->db->sourceFile( "$IP/maintenance/tables.sql" );
if ( $err !== true ) {
//@todo or...?
$this->db->reportQueryError( $err, 0, $sql, __FUNCTION__ );
}
return $this->setupSearchIndex();
$status = parent::createTables();
return $this->setupSearchIndex( $status );;
}
public function setupSearchIndex() {
public function setupSearchIndex( &$status ) {
global $IP;
$status = Status::newGood();
$module = $this->db->getFulltextSearchModule();
$fts3tTable = $this->db->checkForEnabledSearch();
if ( $fts3tTable && !$module ) {