From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Mon, 10 Jan 2011 20:11:43 +0000 (+0000)
Subject: * fixed oracle code for updater (corrected not null BLOB field adding)
X-Git-Tag: 1.31.0-rc.0~32644
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=ba8019afff5843c1123b52aa686c1b3190238268;p=lhc%2Fweb%2Fwiklou.git

* fixed oracle code for updater (corrected not null BLOB field adding)
* added required DB vars in WebInstaller_ExistingWiki
* oracle upgrades normally 1.16=>1.17
---

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 86323d32b9..43ca21ebf6 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -917,6 +917,7 @@ class DatabaseOracle extends DatabaseBase {
 	 * Query whether a given table exists (in the given schema, or the default mw one if not given)
 	 */
 	function tableExists( $table ) {
+		$table = trim($this->tableName($table), '"');
 		$SQL = "SELECT 1 FROM user_tables WHERE table_name='$table'";
 		$res = $this->doQuery( $SQL );
 		if ( $res ) {
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index a38142c979..453aa27b42 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -300,7 +300,7 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
 		}
 
 		// Set the relevant variables from LocalSettings.php
-		$requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword' );
+		$requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword', 'wgDBname', 'wgDBserver' );
 		$status = $this->importVariables( $requiredVars , $vars );
 		$installer = $this->parent->getDBInstaller();
 		$status->merge( $this->importVariables( $installer->getGlobalNames(), $vars ) );
diff --git a/maintenance/oracle/archives/patch_16_17_schema_changes.sql b/maintenance/oracle/archives/patch_16_17_schema_changes.sql
index a315215dd2..c3214b9693 100644
--- a/maintenance/oracle/archives/patch_16_17_schema_changes.sql
+++ b/maintenance/oracle/archives/patch_16_17_schema_changes.sql
@@ -31,7 +31,8 @@ ALTER TABLE &mw_prefix.image MODIFY img_height DEFAULT 0;
 ALTER TABLE &mw_prefix.image MODIFY img_bits DEFAULT 0 NOT NULL;
 ALTER TABLE &mw_prefix.image MODIFY img_user DEFAULT 0 NOT NULL;
 
-ALTER TABLE &mw_prefix.interwiki ADD iw_api BLOB NOT NULL;
+ALTER TABLE &mw_prefix.interwiki ADD iw_api BLOB DEFAULT EMPTY_BLOB();
+ALTER TABLE &mw_prefix.interwiki MODIFY iw_api DEFAULT NULL NOT NULL;
 ALTER TABLE &mw_prefix.interwiki ADD iw_wikiid VARCHAR2(64);
 
 ALTER TABLE &mw_prefix.ipblocks MODIFY ipb_user DEFAULT 0 NOT NULL;