| Index: trunk/phase3/maintenance/oracle/archives/patch_16_17_schema_changes.sql |
| — | — | @@ -31,7 +31,8 @@ |
| 32 | 32 | ALTER TABLE &mw_prefix.image MODIFY img_bits DEFAULT 0 NOT NULL; |
| 33 | 33 | ALTER TABLE &mw_prefix.image MODIFY img_user DEFAULT 0 NOT NULL; |
| 34 | 34 | |
| 35 | | -ALTER TABLE &mw_prefix.interwiki ADD iw_api BLOB NOT NULL; |
| | 35 | +ALTER TABLE &mw_prefix.interwiki ADD iw_api BLOB DEFAULT EMPTY_BLOB(); |
| | 36 | +ALTER TABLE &mw_prefix.interwiki MODIFY iw_api DEFAULT NULL NOT NULL; |
| 36 | 37 | ALTER TABLE &mw_prefix.interwiki ADD iw_wikiid VARCHAR2(64); |
| 37 | 38 | |
| 38 | 39 | ALTER TABLE &mw_prefix.ipblocks MODIFY ipb_user DEFAULT 0 NOT NULL; |
| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -917,6 +917,7 @@ |
| 918 | 918 | * Query whether a given table exists (in the given schema, or the default mw one if not given) |
| 919 | 919 | */ |
| 920 | 920 | function tableExists( $table ) { |
| | 921 | + $table = trim($this->tableName($table), '"'); |
| 921 | 922 | $SQL = "SELECT 1 FROM user_tables WHERE table_name='$table'"; |
| 922 | 923 | $res = $this->doQuery( $SQL ); |
| 923 | 924 | if ( $res ) { |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | // Set the relevant variables from LocalSettings.php |
| 304 | | - $requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword' ); |
| | 304 | + $requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword', 'wgDBname', 'wgDBserver' ); |
| 305 | 305 | $status = $this->importVariables( $requiredVars , $vars ); |
| 306 | 306 | $installer = $this->parent->getDBInstaller(); |
| 307 | 307 | $status->merge( $this->importVariables( $installer->getGlobalNames(), $vars ) ); |