Jira-ID: CRNT-24222

Upgrade - 7.0 upgrade job is not running while upgrading from 4.0 or 5.0.

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/engine@55796 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

1 files changed, 34 insertions, 3 deletions

diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
index 00418f8..89fa20c 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/upgrade/jobs/R6_0_0from5_2_0RuntimeJob.java
@@ -98,7 +98,7 @@ public class R6_0_0from5_2_0RuntimeJob extends DbmsAwareRuntimeUpgradeJob
    //Model Dep Table

 

    private static final String MODEL_DEP_TABLE_NAME = "model_dep";

-

+      

    private static final String MODEL_DEP_FIELD__OID = IdentifiablePersistentBean.FIELD__OID;

 

    private static final String MODEL_DEP_FIELD__DEPLOYER = "deployer";

@@ -114,8 +114,8 @@ public class R6_0_0from5_2_0RuntimeJob extends DbmsAwareRuntimeUpgradeJob
    private static final String MODEL_DEP_IDX2 = "model_dep_idx2";

 

    private static final String MODEL_DEP_IDX3 = "model_dep_idx3";

-

-   // User Participant Table

+   

+   //User Participant Table

 

    private static final String UP_MODEL = "model";

 

@@ -272,6 +272,37 @@ public class R6_0_0from5_2_0RuntimeJob extends DbmsAwareRuntimeUpgradeJob
          }

 

       }, this);

+      

+      //Create MODEL_DEP_LCK table

+

+      DatabaseHelper.createTable(item, new CreateTableInfo(ModelDeploymentBean.LOCK_TABLE_NAME)

+      {

+         private final FieldInfo OID = new FieldInfo(MODEL_DEP_FIELD__OID, Long.TYPE,

+               0, true);

+

+         private final IndexInfo IDX1 = new IndexInfo(ModelDeploymentBean.LOCK_INDEX_NAME, true, new FieldInfo[] {OID});

+ 

+         @Override

+         public FieldInfo[] getFields()

+         {

+            return new FieldInfo[] {

+                  OID

+            };

+         }

+

+         @Override

+         public IndexInfo[] getIndexes()

+         {

+            return new IndexInfo[] {IDX1};

+         }

+

+         @Override

+         public String getSequenceName()

+         {

+            return null;

+         }

+

+      }, this);

 

       //Alter Process Instance Table