From 30c04360c58a4536300ca5b612fe3a7f15679c9f Mon Sep 17 00:00:00 2001
From: Ronald Q <ronald.otn@gmail.com>
Date: Sat, 11 Mar 2017 12:32:53 -0400
Subject: [PATCH] HOR-2698

---
 workflow/engine/classes/model/map/AppSequenceMapBuilder.php | 2 +-
 workflow/engine/classes/model/om/BaseAppSequence.php        | 2 --
 workflow/engine/classes/model/om/BaseAppSequencePeer.php    | 2 --
 workflow/engine/config/schema.xml                           | 2 +-
 workflow/engine/data/mysql/schema.sql                       | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/workflow/engine/classes/model/map/AppSequenceMapBuilder.php b/workflow/engine/classes/model/map/AppSequenceMapBuilder.php
index 40e2a918c..85e86b876 100644
--- a/workflow/engine/classes/model/map/AppSequenceMapBuilder.php
+++ b/workflow/engine/classes/model/map/AppSequenceMapBuilder.php
@@ -63,7 +63,7 @@ class AppSequenceMapBuilder
         $tMap = $this->dbMap->addTable('APP_SEQUENCE');
         $tMap->setPhpName('AppSequence');
 
-        $tMap->setUseIdGenerator(true);
+        $tMap->setUseIdGenerator(false);
 
         $tMap->addPrimaryKey('ID', 'Id', 'int', CreoleTypes::INTEGER, true, null);
 
diff --git a/workflow/engine/classes/model/om/BaseAppSequence.php b/workflow/engine/classes/model/om/BaseAppSequence.php
index b1789f72e..7b4b0b01e 100644
--- a/workflow/engine/classes/model/om/BaseAppSequence.php
+++ b/workflow/engine/classes/model/om/BaseAppSequence.php
@@ -198,8 +198,6 @@ abstract class BaseAppSequence extends BaseObject implements Persistent
                                          // should always be true here (even though technically
                                          // BasePeer::doInsert() can insert multiple rows).
 
-                    $this->setId($pk);  //[IMV] update autoincrement primary key
-
                     $this->setNew(false);
                 } else {
                     $affectedRows += AppSequencePeer::doUpdate($this, $con);
diff --git a/workflow/engine/classes/model/om/BaseAppSequencePeer.php b/workflow/engine/classes/model/om/BaseAppSequencePeer.php
index 53ac2f895..5586351bb 100644
--- a/workflow/engine/classes/model/om/BaseAppSequencePeer.php
+++ b/workflow/engine/classes/model/om/BaseAppSequencePeer.php
@@ -338,8 +338,6 @@ abstract class BaseAppSequencePeer
             $criteria = $values->buildCriteria(); // build Criteria from AppSequence object
         }
 
-                //$criteria->remove(AppSequencePeer::ID); // remove pkey col since this table uses auto-increment
-                
 
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 04e2e75f7..bf73a609d 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -98,7 +98,7 @@
     </unique>
   </table>
   <table name="APP_SEQUENCE" idMethod="native">
-    <column name="ID" type="INTEGER" required="true" primaryKey="true" autoIncrement="true" />
+    <column name="ID" type="INTEGER" required="true" primaryKey="true"/>
   </table>
   <table name="APP_DELEGATION" idMethod="native">
     <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 80b00adbc..adff561d6 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -51,7 +51,7 @@ DROP TABLE IF EXISTS `APP_SEQUENCE`;
 
 CREATE TABLE `APP_SEQUENCE`
 (
-	`ID` INTEGER  NOT NULL AUTO_INCREMENT,
+	`ID` INTEGER  NOT NULL,
 	PRIMARY KEY (`ID`)
 )ENGINE=InnoDB ;
 #-----------------------------------------------------------------------------