Fixed wrong field definition for filearchive. Fixed delete function to handle encodin...

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 794186d..b35035b 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -1058,7 +1058,13 @@ class DatabaseOracle extends DatabaseBase {
                                if ($col_type == 'CLOB')
                                        $conds2['TO_CHAR('.$col.')'] = $wgLang->checkTitleEncoding($val);
                                else
-                                       $conds2[$col] = $wgLang->checkTitleEncoding($val);
+                                       if (is_array($val)) {
+                                               $conds2[$col] = $val;
+                                               foreach($conds2[$col] as &$val2)
+                                                       $val2 = $wgLang->checkTitleEncoding($val2);
+                                       } else {
+                                               $conds2[$col] = $wgLang->checkTitleEncoding($val);
+                                       }
                        }
                
                        return parent::delete( $table, $conds2, $fname );

diff --git a/maintenance/ora/tables.sql b/maintenance/ora/tables.sql
index c300e93..f21ad0b 100644 (file)
--- a/maintenance/ora/tables.sql
+++ b/maintenance/ora/tables.sql
@@ -302,7 +302,7 @@ CREATE TABLE &mw_prefix.filearchive (
   fa_media_type         VARCHAR2(32) DEFAULT NULL,
   fa_major_mime         VARCHAR2(32) DEFAULT 'unknown',
   fa_minor_mime         VARCHAR2(32) DEFAULT 'unknown',
-  fa_description        VARCHAR2(255)         NOT NULL,
+  fa_description        VARCHAR2(255),
   fa_user               NUMBER          NULL  REFERENCES &mw_prefix.mwuser(user_id) ON DELETE SET NULL,
   fa_user_text          VARCHAR2(255)         NOT NULL,
   fa_timestamp          TIMESTAMP(6) WITH TIME ZONE,