From 9991e4d7f45dddb0ce6b3a04bbe1ffe05c4bf3da Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Fri, 25 Jun 2010 15:32:54 +0000
Subject: [PATCH] SAIL-382: DAO to HEAD merge fallout: fix schema upgrade patch
 "property-unique-ctx-value"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/bootstrap-context.xml                 |  2 +-
 .../property-unique-ctx-value.sql                     |  4 ++--
 .../property-unique-ctx-value.sql                     |  4 ++--
 config/alfresco/patch/patch-services-context.xml      | 11 +++--------
 4 files changed, 8 insertions(+), 13 deletions(-)
 rename config/alfresco/dbscripts/upgrade/{3.3 => 3.4}/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql (81%)
 rename config/alfresco/dbscripts/upgrade/{3.3 => 3.4}/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql (80%)

diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 7f9119bda5..2ba4f4d174 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -121,9 +121,9 @@
              <ref bean="patch.db-V3.3-Remove-VersionCount" />
              <ref bean="patch.db-V3.3-Fix-Repo-Seqs" />
              <ref bean="patch.db-V3.3-Fix-AVM-Seqs" />
-             <ref bean="patch.db-V3.3-property-unique-ctx-value" />
              <ref bean="patch.db-V3.3-JBPM-Extra" />
              <ref bean="patch.db-V3.3-Node-Prop-Serializable" />
+             <ref bean="patch.db-V3.4-property-unique-ctx-value" />
           </list>
        </property>
     </bean>
diff --git a/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql b/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql
similarity index 81%
rename from config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql
rename to config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql
index e3c0903aad..59ade2332b 100755
--- a/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql
+++ b/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.MySQLInnoDBDialect/property-unique-ctx-value.sql
@@ -15,11 +15,11 @@ ALTER TABLE alf_prop_unique_ctx
 --
 -- Record script finish
 --
-DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.3-property-unique-ctx-value';
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-property-unique-ctx-value';
 INSERT INTO alf_applied_patch
   (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
   VALUES
   (
-    'patch.db-V3.3-property-unique-ctx-value', 'Manually executed script upgrade V3.3',
+    'patch.db-V3.4-property-unique-ctx-value', 'Manually executed script upgrade V3.4',
      0, 4104, -1, 4105, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
    );
diff --git a/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql b/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql
similarity index 80%
rename from config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql
rename to config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql
index 0b3bd97ecb..6f2951aae3 100755
--- a/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql
+++ b/config/alfresco/dbscripts/upgrade/3.4/org.hibernate.dialect.PostgreSQLDialect/property-unique-ctx-value.sql
@@ -15,11 +15,11 @@ ALTER TABLE alf_prop_unique_ctx
 --
 -- Record script finish
 --
-DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.3-property-unique-ctx-value';
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.4-property-unique-ctx-value';
 INSERT INTO alf_applied_patch
   (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
   VALUES
   (
-    'patch.db-V3.3-property-unique-ctx-value', 'Manually executed script upgrade V3.3',
+    'patch.db-V3.4-property-unique-ctx-value', 'Manually executed script upgrade V3.4',
      0, 4104, -1, 4105, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
    );
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index f150f21715..a49c4c7313 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2226,19 +2226,14 @@
         </property>
     </bean>
 
-    <bean id="patch.db-V3.3-property-unique-ctx-value" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V3.3-property-unique-ctx-value</value></property>
+    <bean id="patch.db-V3.4-property-unique-ctx-value" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V3.4-property-unique-ctx-value</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>4104</value></property>
         <property name="targetSchema"><value>4105</value></property>
         <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/upgrade/3.3/${db.script.dialect}/property-unique-ctx-value.sql</value>
-        </property>
-        <property name="alternatives" >
-            <list>
-                <ref bean="patch.db-V3.2-PropertyValueTables" />
-            </list>
+            <value>classpath:alfresco/dbscripts/upgrade/3.4/${db.script.dialect}/property-unique-ctx-value.sql</value>
         </property>
     </bean>