diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
index 33d024a69..01f0fdf69 100755
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
@@ -79,6 +79,7 @@ class Table extends XMLElement implements IDMethod {
private $heavyIndexing;
private $forReferenceOnly;
private $isTree;
+ private $referenceOnly = false;
/**
* Constructs a table object with a name
@@ -126,6 +127,7 @@ class Table extends XMLElement implements IDMethod {
$this->description = $this->getAttribute("description");
$this->enterface = $this->getAttribute("interface"); // sic ('interface' is reserved word)
$this->isTree = $this->booleanValue($this->getAttribute("isTree"));
+ $this->referenceOnly = $this->booleanValue($this->getAttribute('referenceOnly'));
}
/**
@@ -972,6 +974,16 @@ class Table extends XMLElement implements IDMethod {
$this->isTree = (boolean) $v;
}
+ /**
+ * Get referenceOnly
+ *
+ * @return bool
+ */
+ public function getReferenceOnly()
+ {
+ return $this->referenceOnly;
+ }
+
/**
* Returns a XML representation of this table.
*
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
index d0b52f7f0..d09376661 100755
--- a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
@@ -129,7 +129,7 @@ class PropelOMTask extends AbstractPropelDataModelTask {
foreach ($database->getTables() as $table) {
- if (!$table->isForReferenceOnly()) {
+ if (!$table->isForReferenceOnly() && $table->getReferenceOnly() === false) {
$this->log("\t+ " . $table->getName());
diff --git a/workflow/engine/classes/model/map/ListCompletedMapBuilder.php b/workflow/engine/classes/model/map/ListCompletedMapBuilder.php
index 2fb0adb2a..63ca013e3 100644
--- a/workflow/engine/classes/model/map/ListCompletedMapBuilder.php
+++ b/workflow/engine/classes/model/map/ListCompletedMapBuilder.php
@@ -83,7 +83,7 @@ class ListCompletedMapBuilder
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
- $tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, true, null);
+ $tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
diff --git a/workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php b/workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php
index 1bfa29c50..4b43602bf 100644
--- a/workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php
+++ b/workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php
@@ -55,7 +55,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
* The value for the grp_uid field.
* @var string
*/
- protected $grp_uid = '';
+ protected $grp_uid;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -229,7 +229,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
$v = (string) $v;
}
- if ($this->grp_uid !== $v || $v === '') {
+ if ($this->grp_uid !== $v) {
$this->grp_uid = $v;
$this->modifiedColumns[] = AppAssignSelfServiceValuePeer::GRP_UID;
}
diff --git a/workflow/engine/classes/model/om/BaseAppMessage.php b/workflow/engine/classes/model/om/BaseAppMessage.php
index 123ebc8b0..1617df9fe 100755
--- a/workflow/engine/classes/model/om/BaseAppMessage.php
+++ b/workflow/engine/classes/model/om/BaseAppMessage.php
@@ -133,7 +133,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
* The value for the app_msg_error field.
* @var string
*/
- protected $app_msg_error = '';
+ protected $app_msg_error;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -792,7 +792,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$v = (string) $v;
}
- if ($this->app_msg_error !== $v || $v === '') {
+ if ($this->app_msg_error !== $v) {
$this->app_msg_error = $v;
$this->modifiedColumns[] = AppMessagePeer::APP_MSG_ERROR;
}
diff --git a/workflow/engine/classes/model/om/BaseCatalog.php b/workflow/engine/classes/model/om/BaseCatalog.php
index 7534b9633..032e7a1ce 100644
--- a/workflow/engine/classes/model/om/BaseCatalog.php
+++ b/workflow/engine/classes/model/om/BaseCatalog.php
@@ -55,7 +55,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
* The value for the cat_observation field.
* @var string
*/
- protected $cat_observation = '';
+ protected $cat_observation;
/**
* The value for the cat_create_date field.
@@ -305,7 +305,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
$v = (string) $v;
}
- if ($this->cat_observation !== $v || $v === '') {
+ if ($this->cat_observation !== $v) {
$this->cat_observation = $v;
$this->modifiedColumns[] = CatalogPeer::CAT_OBSERVATION;
}
diff --git a/workflow/engine/classes/model/om/BaseListUnassigned.php b/workflow/engine/classes/model/om/BaseListUnassigned.php
index a47da2fe6..b019cf313 100644
--- a/workflow/engine/classes/model/om/BaseListUnassigned.php
+++ b/workflow/engine/classes/model/om/BaseListUnassigned.php
@@ -35,7 +35,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* The value for the del_index field.
- * @var string
+ * @var int
*/
protected $del_index = 0;
@@ -151,7 +151,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* Get the [del_index] column value.
*
- * @return string
+ * @return int
*/
public function getDelIndex()
{
@@ -230,7 +230,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
- public function getAppPreviousUsrUsername()
+ public function getDelPreviousUsrUsername()
{
return $this->del_previous_usr_username;
@@ -241,7 +241,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
- public function getAppPreviousUsrFirstname()
+ public function getDelPreviousUsrFirstname()
{
return $this->del_previous_usr_firstname;
@@ -252,7 +252,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
- public function getAppPreviousUsrLastname()
+ public function getDelPreviousUsrLastname()
{
return $this->del_previous_usr_lastname;
@@ -558,7 +558,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
- public function setAppPreviousUsrUsername($v)
+ public function setDelPreviousUsrUsername($v)
{
// Since the native PHP type for this column is string,
@@ -572,7 +572,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME;
}
- } // setAppPreviousUsrUsername()
+ } // setDelPreviousUsrUsername()
/**
* Set the value of [del_previous_usr_firstname] column.
@@ -580,7 +580,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
- public function setAppPreviousUsrFirstname($v)
+ public function setDelPreviousUsrFirstname($v)
{
// Since the native PHP type for this column is string,
@@ -594,7 +594,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME;
}
- } // setAppPreviousUsrFirstname()
+ } // setDelPreviousUsrFirstname()
/**
* Set the value of [del_previous_usr_lastname] column.
@@ -602,7 +602,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
- public function setAppPreviousUsrLastname($v)
+ public function setDelPreviousUsrLastname($v)
{
// Since the native PHP type for this column is string,
@@ -616,7 +616,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME;
}
- } // setAppPreviousUsrLastname()
+ } // setDelPreviousUsrLastname()
/**
* Set the value of [app_update_date] column.
@@ -1032,13 +1032,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
return $this->getAppTasTitle();
break;
case 8:
- return $this->getAppPreviousUsrUsername();
+ return $this->getDelPreviousUsrUsername();
break;
case 9:
- return $this->getAppPreviousUsrFirstname();
+ return $this->getDelPreviousUsrFirstname();
break;
case 10:
- return $this->getAppPreviousUsrLastname();
+ return $this->getDelPreviousUsrLastname();
break;
case 11:
return $this->getAppUpdateDate();
@@ -1083,9 +1083,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$keys[5] => $this->getAppTitle(),
$keys[6] => $this->getAppProTitle(),
$keys[7] => $this->getAppTasTitle(),
- $keys[8] => $this->getAppPreviousUsrUsername(),
- $keys[9] => $this->getAppPreviousUsrFirstname(),
- $keys[10] => $this->getAppPreviousUsrLastname(),
+ $keys[8] => $this->getDelPreviousUsrUsername(),
+ $keys[9] => $this->getDelPreviousUsrFirstname(),
+ $keys[10] => $this->getDelPreviousUsrLastname(),
$keys[11] => $this->getAppUpdateDate(),
$keys[12] => $this->getDelPreviousUsrUid(),
$keys[13] => $this->getDelDelegateDate(),
@@ -1147,13 +1147,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->setAppTasTitle($value);
break;
case 8:
- $this->setAppPreviousUsrUsername($value);
+ $this->setDelPreviousUsrUsername($value);
break;
case 9:
- $this->setAppPreviousUsrFirstname($value);
+ $this->setDelPreviousUsrFirstname($value);
break;
case 10:
- $this->setAppPreviousUsrLastname($value);
+ $this->setDelPreviousUsrLastname($value);
break;
case 11:
$this->setAppUpdateDate($value);
@@ -1226,15 +1226,15 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
}
if (array_key_exists($keys[8], $arr)) {
- $this->setAppPreviousUsrUsername($arr[$keys[8]]);
+ $this->setDelPreviousUsrUsername($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
- $this->setAppPreviousUsrFirstname($arr[$keys[9]]);
+ $this->setDelPreviousUsrFirstname($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
- $this->setAppPreviousUsrLastname($arr[$keys[10]]);
+ $this->setDelPreviousUsrLastname($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
@@ -1410,11 +1410,11 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppTasTitle($this->app_tas_title);
- $copyObj->setAppPreviousUsrUsername($this->del_previous_usr_username);
+ $copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username);
- $copyObj->setAppPreviousUsrFirstname($this->del_previous_usr_firstname);
+ $copyObj->setDelPreviousUsrFirstname($this->del_previous_usr_firstname);
- $copyObj->setAppPreviousUsrLastname($this->del_previous_usr_lastname);
+ $copyObj->setDelPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setAppUpdateDate($this->app_update_date);
@@ -1431,7 +1431,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppUid(''); // this is a pkey column, so set to default value
- $copyObj->setDelIndex(0); // this is a pkey column, so set to default value
+ $copyObj->setDelIndex('0'); // this is a pkey column, so set to default value
}
diff --git a/workflow/engine/classes/model/om/BaseListUnassignedPeer.php b/workflow/engine/classes/model/om/BaseListUnassignedPeer.php
index 6ba0832db..b6fd1db99 100644
--- a/workflow/engine/classes/model/om/BaseListUnassignedPeer.php
+++ b/workflow/engine/classes/model/om/BaseListUnassignedPeer.php
@@ -103,7 +103,7 @@ abstract class BaseListUnassignedPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
- BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppPreviousUsrUsername' => 8, 'AppPreviousUsrFirstname' => 9, 'AppPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
+ BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
@@ -595,7 +595,7 @@ abstract class BaseListUnassignedPeer
/**
* Retrieve object using using composite pkey values.
* @param string $app_uid
- * @param string $del_index
+ * @param int $del_index
* @param Connection $con
* @return ListUnassigned
*/
diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php
index 00dfdd619..07501717c 100755
--- a/workflow/engine/classes/model/om/BaseProcess.php
+++ b/workflow/engine/classes/model/om/BaseProcess.php
@@ -250,10 +250,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
protected $pro_unit_cost = '';
/**
- * The value for the pro_debug field.
+ * The value for the pro_itee field.
* @var int
*/
- protected $pro_itee = 1;
+ protected $pro_itee = 0;
/**
* The value for the pro_action_done field.
@@ -727,7 +727,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
/**
* Get the [pro_itee] column value.
*
- * @return string
+ * @return int
*/
public function getProItee()
{
@@ -1577,7 +1577,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$v = (int) $v;
}
- if ($this->pro_itee !== $v || $v === 1) {
+ if ($this->pro_itee !== $v || $v === 0) {
$this->pro_itee = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_ITEE;
}
@@ -1697,7 +1697,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_unit_cost = $rs->getString($startcol + 36);
- $this->pro_itee = $rs->getString($startcol + 37);
+ $this->pro_itee = $rs->getInt($startcol + 37);
$this->pro_action_done = $rs->getString($startcol + 38);
diff --git a/workflow/engine/classes/model/om/BaseTimerEvent.php b/workflow/engine/classes/model/om/BaseTimerEvent.php
index 1ab7a9076..c7b18ceb3 100644
--- a/workflow/engine/classes/model/om/BaseTimerEvent.php
+++ b/workflow/engine/classes/model/om/BaseTimerEvent.php
@@ -85,7 +85,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
* The value for the tmrevn_configuration_data field.
* @var string
*/
- protected $tmrevn_configuration_data = '';
+ protected $tmrevn_configuration_data;
/**
* The value for the tmrevn_next_run_date field.
@@ -611,7 +611,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
$v = (string) $v;
}
- if ($this->tmrevn_configuration_data !== $v || $v === '') {
+ if ($this->tmrevn_configuration_data !== $v) {
$this->tmrevn_configuration_data = $v;
$this->modifiedColumns[] = TimerEventPeer::TMREVN_CONFIGURATION_DATA;
}
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index f4565ef9e..1a44b5f04 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -93,7 +93,7 @@
-