Updates to upgrade

modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java

@@ -806,6 +806,7 @@ public class DbSqlSession implements Session {
         Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection);
         database.setDefaultSchemaName(this.connectionMetadataDefaultSchema);
         Liquibase liquibase = new Liquibase("org/activiti/db/liquibase/activiti-upgrade-" + dbVersion + ".xml", new ClassLoaderResourceAccessor(), database);
+        liquibase.getDatabase().setDatabaseChangeLogLockTableName("ACT_" + liquibase.getDatabase().getDatabaseChangeLogLockTableName());
         liquibase.update("production");
       } catch (Exception e) {
         throw new ActivitiException("Error creating Activiti tables", e);

modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.10.xml

@@ -12,6 +12,9 @@
         <addColumn tableName="ACT_RU_EXECUTION">
             <column name="CACHED_ENT_STATE_" type="INTEGER" />
         </addColumn>
+        <update tableName="ACT_RU_EXECUTION">
+            <column name="CACHED_ENT_STATE_" value="7"/>
+        </update>
     </changeSet>
     
     <changeSet id="3 ACT_RU_IDENTITYLINK.PROC_DEF_ID" author="ditte">

modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.11.xml

@@ -68,6 +68,9 @@
         <addColumn tableName="ACT_RU_TASK">
             <column name="SUSPENSION_STATE_" type="INTEGER"/>            
         </addColumn>
+        <update tableName="ACT_RU_TASK">
+            <column name="SUSPENSION_STATE_" value="1"/>
+        </update>
         <modifyDataType tableName="ACT_RU_TASK" columnName="OWNER_" newDataType="NVARCHAR(255)"/>
         <modifyDataType tableName="ACT_RU_TASK" columnName="ASSIGNEE_" newDataType="NVARCHAR(255)"/>
    </changeSet>
@@ -113,7 +116,9 @@
             <column name="PROC_INST_ID_" type="NVARCHAR(64)"/>
             <column name="EXECUTION_ID_" type="NVARCHAR(64)"/>
             <column name="TASK_ID_" type="NVARCHAR(64)"/>
-            <column name="NAME_" type="NVARCHAR(255)"/>
+            <column name="NAME_" type="NVARCHAR(255)">
+              <constraints primaryKey="true" nullable="false"/>
+            </column>
             <column name="VAR_TYPE_" type="NVARCHAR(100)"/>
             <column name="REV_" type="INTEGER"/>
             <column name="BYTEARRAY_ID_" type="NVARCHAR(64)"/>

modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.7.xml

@@ -264,7 +264,7 @@
             <column name="DOUBLE_"              type="DOUBLE" />
             <column name="LONG_"                type="BIGINT" />
             <column name="TEXT_"                type="NVARCHAR(4000)" />
-            <column name="TEXT2_"                type="NVARCHAR(4000)" />
+            <column name="TEXT2_"               type="NVARCHAR(4000)" />
         </createTable>
     </changeSet>
  
@@ -402,8 +402,8 @@
             <column name="BYTEARRAY_ID_"        type="NVARCHAR(64)" />
             <column name="DOUBLE_"              type="DOUBLE" />
             <column name="LONG_"                type="BIGINT" />
-            <column name="TEXT_"                type="NVARCHAR(255)" />
-            <column name="TEXT2_"               type="NVARCHAR(255)" />
+            <column name="TEXT_"                type="NVARCHAR(4000)" />
+            <column name="TEXT2_"               type="NVARCHAR(4000)" />
         </createTable>
     </changeSet>
     
@@ -437,7 +437,9 @@
             <column name="ID_" type="NVARCHAR(64)">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
-            <column name="TIME_" type="TIMESTAMP" />
+            <column name="TIME_" type="TIMESTAMP">
+              <constraints nullable="false"/>
+            </column>
             <column name="USER_ID_" type="NVARCHAR(255)" />
             <column name="TASK_ID_" type="NVARCHAR(64)" />
             <column name="PROC_INST_ID_" type="NVARCHAR(64)" />

modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.9.xml

@@ -12,6 +12,9 @@
         <addColumn tableName="ACT_GE_BYTEARRAY">
             <column name="GENERATED_" type="BOOLEAN" />
         </addColumn>
+        <update tableName="ACT_GE_BYTEARRAY">
+            <column name="GENERATED_" value="0"/>
+        </update>
     </changeSet>
 
     <changeSet id="11 ACT_RU_EXECUTION.IS_EVENT_SCOPE_" author="bzeuner">
@@ -21,6 +24,12 @@
         <addColumn tableName="ACT_RU_EXECUTION">
             <column name="SUSPENSION_STATE_" type="INTEGER" />
         </addColumn>
+        <update tableName="ACT_RU_EXECUTION">
+            <column name="IS_EVENT_SCOPE_" value="0"/>
+        </update>
+        <update tableName="ACT_RU_EXECUTION">
+            <column name="SUSPENSION_STATE_" value="1"/>
+        </update>
     </changeSet>
 
     <changeSet id="12 ACT_RE_PROCDEF.REV_" author="bzeuner">
@@ -30,6 +39,12 @@
         <addColumn tableName="ACT_RE_PROCDEF">
             <column name="SUSPENSION_STATE_" type="INTEGER" />
         </addColumn>
+        <update tableName="ACT_RE_PROCDEF">
+            <column name="REV_" value="1"/>
+        </update>
+        <update tableName="ACT_RE_PROCDEF">
+            <column name="SUSPENSION_STATE_" value="1"/>
+        </update>
     </changeSet>
     
     <changeSet id="13 ACT_RU_EVENT_SUBSCR" author="bzeuner">