From 68f530eb79693fc6979c270eeb6eecedc5f9a6fc Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 21 Jun 2013 15:15:38 +0200
Subject: [PATCH] Added missing SQL update and cleanup

---
 com.woltlab.wcf/package.xml   |  1 +
 com.woltlab.wcf/update_b2.sql |  1 -
 com.woltlab.wcf/update_b3.sql | 13 -------------
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_b2.sql
 delete mode 100644 com.woltlab.wcf/update_b3.sql

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 3aeac6b435..4cd4be43dc 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -48,6 +48,7 @@
 		<instruction type="language">language/*.xml</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		<instruction type="script">acp/update_b4.php</instruction>
+		<instruction type="sql">update_b4.sql</instruction>
 		
 		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 		<instruction type="option">option.xml</instruction>
diff --git a/com.woltlab.wcf/update_b2.sql b/com.woltlab.wcf/update_b2.sql
deleted file mode 100644
index ce9be38882..0000000000
--- a/com.woltlab.wcf/update_b2.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?clipfish\\.de/(?:.*?/)?video/(?<ID>\\d+)/' WHERE title = 'Clipfish';
\ No newline at end of file
diff --git a/com.woltlab.wcf/update_b3.sql b/com.woltlab.wcf/update_b3.sql
deleted file mode 100644
index 6d0b341286..0000000000
--- a/com.woltlab.wcf/update_b3.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE wcf1_acp_session CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
-ALTER TABLE wcf1_acp_session_access_log CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
-ALTER TABLE wcf1_session CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
-
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/watch\\?(?:.*?&)?v=)(?P<ID>[a-zA-Z0-9_-]+)(?P<start>(?:#a?t=(?:\\d+|(?:\\d+h(?:\\d+m)?(?:\\d+s)?)|(?:\\d+m(?:\\d+s)?)|(?:\\d+s))$)?)' WHERE title = 'YouTube';
-UPDATE wcf1_bbcode_media_provider SET regex = 'http://vimeo\\.com/(?P<ID>\\d+)' WHERE title = 'Vimeo';
-UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?myvideo\\.de/watch/(?P<ID>\\d+)' WHERE title = 'MyVideo';
-UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?clipfish\\.de/(?:.*?/)?video/(?P<ID>\\d+)/' WHERE title = 'Clipfish';
-UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?veoh\\.com/watch/v(?P<ID>\\d+[a-zA-Z0-9]+)' WHERE title = 'Veoh';
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:www\\.)?dailymotion\\.com/video/(?P<ID>[a-zA-Z0-9]+)' WHERE title = 'DailyMotion';
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:.+?\\.)?youku\\.com/v_show/id_(?P<ID>[a-zA-Z0-9_-]+)(?:\\.html)?' WHERE title = 'YouKu';
-UPDATE wcf1_bbcode_media_provider SET regex = 'https://gist.github.com/(?P<ID>[^/]+/[0-9a-zA-Z]+)' WHERE title = 'github gist';
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://soundcloud.com/(?P<artist>[a-zA-Z0-9_-]+)/(?P<song>[a-zA-Z0-9_-]+)' WHERE title = 'Soundcloud';
\ No newline at end of file
-- 
2.20.1