diff --git a/workflow/engine/classes/model/map/LanguageMapBuilder.php b/workflow/engine/classes/model/map/LanguageMapBuilder.php index afa531039..a8b5f319e 100755 --- a/workflow/engine/classes/model/map/LanguageMapBuilder.php +++ b/workflow/engine/classes/model/map/LanguageMapBuilder.php @@ -67,6 +67,8 @@ class LanguageMapBuilder $tMap->addPrimaryKey('LAN_ID', 'LanId', 'string', CreoleTypes::VARCHAR, true, 4); + $tMap->addColumn('LAN_LOCATION', 'LanLocation', 'string', CreoleTypes::VARCHAR, true, 4); + $tMap->addColumn('LAN_NAME', 'LanName', 'string', CreoleTypes::VARCHAR, true, 30); $tMap->addColumn('LAN_NATIVE_NAME', 'LanNativeName', 'string', CreoleTypes::VARCHAR, true, 30); diff --git a/workflow/engine/classes/model/om/BaseLanguage.php b/workflow/engine/classes/model/om/BaseLanguage.php index 1adf216c9..4b2968baf 100755 --- a/workflow/engine/classes/model/om/BaseLanguage.php +++ b/workflow/engine/classes/model/om/BaseLanguage.php @@ -1,13 +1,19 @@ setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 7; // 7 = LanguagePeer::NUM_COLUMNS - LanguagePeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 8; // 8 = LanguagePeer::NUM_COLUMNS - LanguagePeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Language object", $e); @@ -750,6 +756,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent if (array_key_exists($keys[7], $arr)) { $this->setLanCalendar($arr[$keys[7]]); } + } /** @@ -766,7 +773,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent } if ($this->isColumnModified(LanguagePeer::LAN_LOCATION)) { - $criteria->add(LanguagePeer::LAN_ID, $this->lan_location); + $criteria->add(LanguagePeer::LAN_LOCATION, $this->lan_location); } if ($this->isColumnModified(LanguagePeer::LAN_NAME)) { @@ -896,7 +903,6 @@ abstract class BaseLanguage extends BaseObject implements Persistent * same instance for all member of this class. The method could therefore * be static, but this would prevent one from overriding the behavior. * - * * @return LanguagePeer */ public function getPeer() diff --git a/workflow/engine/classes/model/om/BaseLanguagePeer.php b/workflow/engine/classes/model/om/BaseLanguagePeer.php index 01d0ccaa7..f745cf95b 100755 --- a/workflow/engine/classes/model/om/BaseLanguagePeer.php +++ b/workflow/engine/classes/model/om/BaseLanguagePeer.php @@ -25,7 +25,7 @@ abstract class BaseLanguagePeer const CLASS_DEFAULT = 'classes.model.Language'; /** The total number of columns. */ - const NUM_COLUMNS = 7; + const NUM_COLUMNS = 8; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -69,7 +69,7 @@ abstract class BaseLanguagePeer BasePeer::TYPE_PHPNAME => array ('LanId', 'LanLocation', 'LanName', 'LanNativeName', 'LanDirection', 'LanWeight', 'LanEnabled', 'LanCalendar', ), BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID, LanguagePeer::LAN_LOCATION, LanguagePeer::LAN_NAME, LanguagePeer::LAN_NATIVE_NAME, LanguagePeer::LAN_DIRECTION, LanguagePeer::LAN_WEIGHT, LanguagePeer::LAN_ENABLED, LanguagePeer::LAN_CALENDAR, ), BasePeer::TYPE_FIELDNAME => array ('LAN_ID', 'LAN_LOCATION', 'LAN_NAME', 'LAN_NATIVE_NAME', 'LAN_DIRECTION', 'LAN_WEIGHT', 'LAN_ENABLED', 'LAN_CALENDAR', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,) + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) ); /** @@ -82,7 +82,7 @@ abstract class BaseLanguagePeer BasePeer::TYPE_PHPNAME => array ('LanId' => 0, 'LanLocation' => 1, 'LanName' => 2, 'LanNativeName' => 3, 'LanDirection' => 4, 'LanWeight' => 5, 'LanEnabled' => 6, 'LanCalendar' => 7, ), BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID => 0, LanguagePeer::LAN_LOCATION => 1, LanguagePeer::LAN_NAME => 2, LanguagePeer::LAN_NATIVE_NAME => 3, LanguagePeer::LAN_DIRECTION => 4, LanguagePeer::LAN_WEIGHT => 5, LanguagePeer::LAN_ENABLED => 6, LanguagePeer::LAN_CALENDAR => 7, ), BasePeer::TYPE_FIELDNAME => array ('LAN_ID' => 0, 'LAN_LOCATION' => 1, 'LAN_NAME' => 2, 'LAN_NATIVE_NAME' => 3, 'LAN_DIRECTION' => 4, 'LAN_WEIGHT' => 5, 'LAN_ENABLED' => 6, 'LAN_CALENDAR' => 7, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,) + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) ); /**