Merged V3.1 to HEAD

17006: Added implicit SQL script variables for TRUE and FALSE
   17007: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.1:r17006-17007


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-10-22 13:58:35 +00:00
parent 0d51a96d7c
commit fd738ed890
5 changed files with 118 additions and 0 deletions

View File

@@ -1148,6 +1148,21 @@
</property>
</bean>
<bean id="patch.db-V2.2-CleanNodeStatuses" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-CleanNodeStatuses</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>89</value></property>
<property name="targetSchema"><value>90</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-2.2-CleanNodeStatuses.sql</value>
</property>
<property name="alternatives" >
<list>
<ref bean="patch.db-V2.2-Upgrade-From-2.1" />
</list>
</property>
</bean>
<bean id="patch.db-V2.2-0-CreateMissingTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-0-CreateMissingTables</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1159,6 +1174,7 @@
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-CleanNodeStatuses" />
<ref bean="patch.db-V2.2-ACL" />
</list>
</property>
@@ -1181,6 +1197,7 @@
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-CleanNodeStatuses" />
<ref bean="patch.db-V2.2-0-CreateMissingTables" />
</list>
</property>