http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96091

Revision: 96091
Author:   freakolowsky
Date:     2011-09-02 11:26:54 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
* MFT of 1.18 relevant part of r95986

Modified Paths:
--------------
    branches/REL1_18/phase3/includes/installer/OracleUpdater.php
    
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_email_index.sql

Added Paths:
-----------
    branches/REL1_18/phase3/maintenance/oracle/archives/patch-uploadstash.sql
    
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_former_groups.sql

Modified: branches/REL1_18/phase3/includes/installer/OracleUpdater.php
===================================================================
--- branches/REL1_18/phase3/includes/installer/OracleUpdater.php        
2011-09-02 11:04:57 UTC (rev 96090)
+++ branches/REL1_18/phase3/includes/installer/OracleUpdater.php        
2011-09-02 11:26:54 UTC (rev 96091)
@@ -30,10 +30,12 @@
                        array( 'doSchemaUpgrade17' ),
                        array( 'doInsertPage0' ),
                        array( 'doRemoveNotNullEmptyDefaults' ),
+                       array( 'addTable', 'user_former_groups', 
'patch-user_former_groups.sql' ),
                        
                        //1.18
                        array( 'addIndex',      'user',          'i02',       
'patch-user_email_index.sql' ),
                        array( 'modifyField', 'user_properties', 'up_property', 
'patch-up_property.sql' ),
+                       array( 'addTable', 'uploadstash', 
'patch-uploadstash.sql' ),
 
                        // till 2.0 i guess
                        array( 'doRebuildDuplicateFunction' ),

Added: branches/REL1_18/phase3/maintenance/oracle/archives/patch-uploadstash.sql
===================================================================
--- branches/REL1_18/phase3/maintenance/oracle/archives/patch-uploadstash.sql   
                        (rev 0)
+++ branches/REL1_18/phase3/maintenance/oracle/archives/patch-uploadstash.sql   
2011-09-02 11:26:54 UTC (rev 96091)
@@ -0,0 +1,25 @@
+define mw_prefix='{$wgDBprefix}';
+
+CREATE SEQUENCE uploadstash_us_id_seq;
+CREATE TABLE &mw_prefix.uploadstash (
+       us_id                 NUMBER       NOT NULL,
+  us_user               NUMBER          DEFAULT 0 NOT NULL,
+       us_key                                                          
VARCHAR2(255) NOT NULL,
+       us_orig_path                                    VARCHAR2(255) NOT NULL,
+       us_path                                                         
VARCHAR2(255) NOT NULL,
+       us_source_type                          VARCHAR2(50),
+  us_timestamp          TIMESTAMP(6) WITH TIME ZONE,
+       us_status                                                       
VARCHAR2(50) NOT NULL,
+       us_size                                                         NUMBER 
NOT NULL,
+       us_sha1                                                         
VARCHAR2(32) NOT NULL,
+       us_mime                                                         
VARCHAR2(255),
+  us_media_type         VARCHAR2(32) DEFAULT NULL,
+       us_image_width                          NUMBER,
+       us_image_height                         NUMBER,
+       us_image_bits                                   NUMBER
+);
+ALTER TABLE &mw_prefix.uploadstash ADD CONSTRAINT &mw_prefix.uploadstash_pk 
PRIMARY KEY (us_id);
+ALTER TABLE &mw_prefix.uploadstash ADD CONSTRAINT &mw_prefix.uploadstash_fk1 
FOREIGN KEY (us_user) REFERENCES &mw_prefix.mwuser(user_id) ON DELETE SET NULL 
DEFERRABLE INITIALLY DEFERRED;
+CREATE INDEX &mw_prefix.uploadstash_i01 ON &mw_prefix.uploadstash (us_user);
+CREATE INDEX &mw_prefix.uploadstash_i02 ON &mw_prefix.uploadstash 
(us_timestamp);
+CREATE UNIQUE INDEX &mw_prefix.uploadstash_u01 ON &mw_prefix.uploadstash 
(us_key);


Property changes on: 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-uploadstash.sql
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_email_index.sql
===================================================================
--- 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_email_index.sql  
    2011-09-02 11:04:57 UTC (rev 96090)
+++ 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_email_index.sql  
    2011-09-02 11:26:54 UTC (rev 96091)
@@ -1,4 +1,4 @@
 define mw_prefix='{$wgDBprefix}';
 
-CREATE INDEX &mw_prefix.mwuser_i02 ON &mw_prefix.mwuser (user_email, 
user_name);
+CREATE INDEX &mw_prefix.mwuser_i02 ON &mw_prefix.mwuser (user_email);
 

Added: 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_former_groups.sql
===================================================================
--- 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_former_groups.sql
                            (rev 0)
+++ 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_former_groups.sql
    2011-09-02 11:26:54 UTC (rev 96091)
@@ -0,0 +1,9 @@
+define mw_prefix='{$wgDBprefix}';
+
+CREATE TABLE &mw_prefix.user_former_groups (
+  ufg_user   NUMBER      DEFAULT 0 NOT NULL,
+  ufg_group  VARCHAR2(16)     NOT NULL
+);
+ALTER TABLE &mw_prefix.user_former_groups ADD CONSTRAINT 
&mw_prefix.user_former_groups_fk1 FOREIGN KEY (ufg_user) REFERENCES 
&mw_prefix.mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+CREATE UNIQUE INDEX &mw_prefix.user_former_groups_u01 ON 
&mw_prefix.user_former_groups (ufg_user,ufg_group);
+


Property changes on: 
branches/REL1_18/phase3/maintenance/oracle/archives/patch-user_former_groups.sql
___________________________________________________________________
Added: svn:eol-style
   + native


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to