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
This commit is contained in:
Jan Vonka
2010-06-25 15:32:54 +00:00
parent b111e47cc6
commit 9991e4d7f4
4 changed files with 8 additions and 13 deletions

View File

@@ -121,9 +121,9 @@
<ref bean="patch.db-V3.3-Remove-VersionCount" /> <ref bean="patch.db-V3.3-Remove-VersionCount" />
<ref bean="patch.db-V3.3-Fix-Repo-Seqs" /> <ref bean="patch.db-V3.3-Fix-Repo-Seqs" />
<ref bean="patch.db-V3.3-Fix-AVM-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-JBPM-Extra" />
<ref bean="patch.db-V3.3-Node-Prop-Serializable" /> <ref bean="patch.db-V3.3-Node-Prop-Serializable" />
<ref bean="patch.db-V3.4-property-unique-ctx-value" />
</list> </list>
</property> </property>
</bean> </bean>

View File

@@ -15,11 +15,11 @@ ALTER TABLE alf_prop_unique_ctx
-- --
-- Record script finish -- 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 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) (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES 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' 0, 4104, -1, 4105, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
); );

View File

@@ -15,11 +15,11 @@ ALTER TABLE alf_prop_unique_ctx
-- --
-- Record script finish -- 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 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) (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES 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' 0, 4104, -1, 4105, null, 'UNKOWN', ${TRUE}, ${TRUE}, 'Script completed'
); );

View File

@@ -2226,19 +2226,14 @@
</property> </property>
</bean> </bean>
<bean id="patch.db-V3.3-property-unique-ctx-value" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch"> <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.3-property-unique-ctx-value</value></property> <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="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property> <property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>4104</value></property> <property name="fixesToSchema"><value>4104</value></property>
<property name="targetSchema"><value>4105</value></property> <property name="targetSchema"><value>4105</value></property>
<property name="scriptUrl"> <property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/3.3/${db.script.dialect}/property-unique-ctx-value.sql</value> <value>classpath:alfresco/dbscripts/upgrade/3.4/${db.script.dialect}/property-unique-ctx-value.sql</value>
</property>
<property name="alternatives" >
<list>
<ref bean="patch.db-V3.2-PropertyValueTables" />
</list>
</property> </property>
</bean> </bean>