Matthias Mullie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366563 )

Change subject: Follow-up to '3D' file type addition
......................................................................

Follow-up to '3D' file type addition

Based on feedback on Id78a504302fa664b353a4c45bdc5d99f95a0180a

Bug: T157348
Change-Id: Id6bfe8d20307f62e4673a5ef30e79f164b1ea034
---
M includes/installer/MysqlUpdater.php
M includes/installer/PostgresUpdater.php
A maintenance/postgres/archives/patch-add-3d.sql
M maintenance/postgres/tables.sql
4 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/366563/1

diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index adfe2f6..b4ae1dd 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -301,6 +301,8 @@
                        [ 'dropIndex', 'user_groups', 'ug_user_group', 
'patch-user_groups-primary-key.sql' ],
                        [ 'addField', 'user_groups', 'ug_expiry', 
'patch-user_groups-ug_expiry.sql' ],
                        [ 'addIndex', 'image', 'img_user_timestamp', 
'patch-image-user-index-2.sql' ],
+
+                       // 1.30
                        [ 'modifyField', 'image', 'img_media_type', 
'patch-add-3d.sql' ],
                ];
        }
diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index 0172f1a..d8db6a2 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -452,6 +452,9 @@
                        [ 'addPgIndex', 'externallinks', 'el_from_index_60', '( 
el_from, el_index_60, el_id )' ],
                        [ 'addPgField', 'user_groups', 'ug_expiry', 
"TIMESTAMPTZ NULL" ],
                        [ 'addPgIndex', 'user_groups', 'user_groups_expiry', '( 
ug_expiry )' ],
+
+                       // 1.30
+                       [ 'modifyField', 'image', 'img_media_type', 
'patch-add-3d.sql' ],
                ];
        }
 
diff --git a/maintenance/postgres/archives/patch-add-3d.sql 
b/maintenance/postgres/archives/patch-add-3d.sql
new file mode 100644
index 0000000..f892755
--- /dev/null
+++ b/maintenance/postgres/archives/patch-add-3d.sql
@@ -0,0 +1 @@
+ALTER TYPE media_type ADD VALUE '3D';
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index e19c447..03fd03a 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -393,7 +393,7 @@
 CREATE INDEX fa_sha1      ON filearchive (fa_sha1);
 
 CREATE SEQUENCE uploadstash_us_id_seq;
-CREATE TYPE media_type AS ENUM 
('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
+CREATE TYPE media_type AS ENUM 
('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE','3D');
 
 CREATE TABLE uploadstash (
   us_id           INTEGER PRIMARY KEY NOT NULL DEFAULT 
nextval('uploadstash_us_id_seq'),

-- 
To view, visit https://gerrit.wikimedia.org/r/366563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6bfe8d20307f62e4673a5ef30e79f164b1ea034
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>

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

Reply via email to