* fixed ipblocks.ipb_by_text field, removed default blank not null (fixed install&update)

* fixed Block->insert; ipblocks.ipb_id is autoincrement field (should use sequences for compatibility)

1 files changed, 11 insertions, 0 deletions

diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index 82031ad2cb1e..64188cb8440f 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -46,6 +46,7 @@ class OracleUpdater extends DatabaseUpdater {
 			array( 'addTable', 'globalinterwiki', 'patch-globalinterwiki.sql' ),
 			array( 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1_field.sql' ),
 			array( 'addField', 'archive', 'ar_sha1', 'patch-ar_sha1_field.sql' ),
+			array( 'doRemoveNotNullEmptyDefaults2' ),
 
 			// till 2.0 i guess
 			array( 'doRebuildDuplicateFunction' ),
@@ -145,6 +146,16 @@ class OracleUpdater extends DatabaseUpdater {
 		$this->applyPatch( 'patch_remove_not_null_empty_defs.sql', false );
 		$this->output( "ok\n" );
 	}
+	protected function doRemoveNotNullEmptyDefaults2() {
+		$this->output( "Removing not null empty constraints ... " );
+		$meta = $this->db->fieldInfo( 'ipblocks' , 'ipb_by_text' );
+		if ( $meta->isNullable() ) {
+			$this->output( "constraints seem to be removed\n" );
+			return;
+		}
+		$this->applyPatch( 'patch_remove_not_null_empty_defs2.sql', false );
+		$this->output( "ok\n" );
+	}
 
 	/**
 	 * rebuilding of the function that duplicates tables for tests