Fixed update a1 -> b1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 6f406fb850835b49a077cf46e93c5a6ed63be2af..ee5cf6207206c2885b4583c2a7fe803d4bed1816 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -32,6 +32,10 @@
        </instructions>
        
        <instructions type="update" fromversion="2.0.0 Alpha 1">
+               <instruction type="sql">update_b1.sql</instruction>
+               <instruction type="script">acp/update_4.0.0_b1.php</instruction>
+               <instruction type="sql">update_post_b1.sql</instruction>
+               
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">template.tar</instruction>
@@ -40,7 +44,6 @@
                <instruction type="clipboardAction">clipboardAction.xml</instruction>
                <instruction type="coreObject">coreObject.xml</instruction>
                <instruction type="option">option.xml</instruction>
-               <instruction type="sql">update_b1.sql</instruction>
                <instruction type="userGroupOption">userGroupOption.xml</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_b1.sql b/com.woltlab.wcf/update_b1.sql
index 0509a83de22cc0da6c3490aeb3290f749a9e1529..2d12911b4ce987f6a5c83fd8fb23ae12c88fac37 100644 (file)
--- a/com.woltlab.wcf/update_b1.sql
+++ b/com.woltlab.wcf/update_b1.sql
@@ -1,7 +1,10 @@
-/* 6570e38 */
+ALTER TABLE wcf1_acp_template ADD COLUMN application VARCHAR(255) NOT NULL;
+
+ALTER TABLE wcf1_package_installation_file_log ADD COLUMN application VARCHAR(255) NOT NULL;
+
 ALTER TABLE wcf1_template DROP COLUMN obsolete;
+ALTER TABLE wcf1_template ADD COLUMN application VARCHAR(255) NOT NULL;
 ALTER TABLE wcf1_template ADD COLUMN lastModificationTime INT(10) NOT NULL DEFAULT 0;
 
 ALTER TABLE wcf1_template_group CHANGE parentTemplateGroupID INT(10) NULL;
-
 ALTER TABLE wcf1_template_group ADD FOREIGN KEY (parentTemplateGroupID) REFERENCES wcf1_template_group (templateGroupID) ON DELETE SET NULL;
\ No newline at end of file

diff --git a/com.woltlab.wcf/update_post_b1.sql b/com.woltlab.wcf/update_post_b1.sql
new file mode 100644 (file)
index 0000000..bfe01e4
--- /dev/null
+++ b/com.woltlab.wcf/update_post_b1.sql
@@ -0,0 +1,5 @@
+ALTER TABLE wcf1_acp_template ADD UNIQUE KEY applicationTemplate (application, templateName);
+
+ALTER TABLE wcf1_package_installation_file_log ADD UNIQUE KEY applicationFile (application, filename);
+
+ALTER TABLE wcf1_template ADD UNIQUE KEY applicationTemplate (application, templateGroupID templateName);
\ No newline at end of file