diff --git a/rbac/engine/classes/model/map/PermissionsMapBuilder.php b/rbac/engine/classes/model/map/PermissionsMapBuilder.php index dc79861c3..49dc48094 100644 --- a/rbac/engine/classes/model/map/PermissionsMapBuilder.php +++ b/rbac/engine/classes/model/map/PermissionsMapBuilder.php @@ -68,9 +68,9 @@ class PermissionsMapBuilder { $tMap->addColumn('PER_CODE', 'PerCode', 'string', CreoleTypes::VARCHAR, true, 32); - $tMap->addColumn('PER_CREATE_DATE', 'PerCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('PER_CREATE_DATE', 'PerCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('PER_UPDATE_DATE', 'PerUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('PER_UPDATE_DATE', 'PerUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('PER_STATUS', 'PerStatus', 'int', CreoleTypes::INTEGER, true, null); diff --git a/rbac/engine/classes/model/map/RbacUsersMapBuilder.php b/rbac/engine/classes/model/map/RbacUsersMapBuilder.php index 29f615eaa..2623eddd7 100644 --- a/rbac/engine/classes/model/map/RbacUsersMapBuilder.php +++ b/rbac/engine/classes/model/map/RbacUsersMapBuilder.php @@ -78,9 +78,9 @@ class RbacUsersMapBuilder { $tMap->addColumn('USR_DUE_DATE', 'UsrDueDate', 'int', CreoleTypes::DATE, true, null); - $tMap->addColumn('USR_CREATE_DATE', 'UsrCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('USR_CREATE_DATE', 'UsrCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('USR_UPDATE_DATE', 'UsrUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('USR_UPDATE_DATE', 'UsrUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('USR_STATUS', 'UsrStatus', 'int', CreoleTypes::INTEGER, true, null); diff --git a/rbac/engine/classes/model/map/RolesMapBuilder.php b/rbac/engine/classes/model/map/RolesMapBuilder.php index 8846d8899..674ecf6d3 100644 --- a/rbac/engine/classes/model/map/RolesMapBuilder.php +++ b/rbac/engine/classes/model/map/RolesMapBuilder.php @@ -72,9 +72,9 @@ class RolesMapBuilder { $tMap->addColumn('ROL_CODE', 'RolCode', 'string', CreoleTypes::VARCHAR, true, 32); - $tMap->addColumn('ROL_CREATE_DATE', 'RolCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('ROL_CREATE_DATE', 'RolCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('ROL_UPDATE_DATE', 'RolUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('ROL_UPDATE_DATE', 'RolUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('ROL_STATUS', 'RolStatus', 'int', CreoleTypes::INTEGER, true, null); diff --git a/rbac/engine/classes/model/map/SystemsMapBuilder.php b/rbac/engine/classes/model/map/SystemsMapBuilder.php index 63e24d3a8..8589a3b7d 100644 --- a/rbac/engine/classes/model/map/SystemsMapBuilder.php +++ b/rbac/engine/classes/model/map/SystemsMapBuilder.php @@ -68,9 +68,9 @@ class SystemsMapBuilder { $tMap->addColumn('SYS_CODE', 'SysCode', 'string', CreoleTypes::VARCHAR, true, 32); - $tMap->addColumn('SYS_CREATE_DATE', 'SysCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('SYS_CREATE_DATE', 'SysCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null); - $tMap->addColumn('SYS_UPDATE_DATE', 'SysUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null); + $tMap->addColumn('SYS_UPDATE_DATE', 'SysUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('SYS_STATUS', 'SysStatus', 'int', CreoleTypes::INTEGER, true, null); diff --git a/rbac/engine/classes/model/om/BasePermissions.php b/rbac/engine/classes/model/om/BasePermissions.php index 7f87f6032..4fa6f6751 100644 --- a/rbac/engine/classes/model/om/BasePermissions.php +++ b/rbac/engine/classes/model/om/BasePermissions.php @@ -46,14 +46,14 @@ abstract class BasePermissions extends BaseObject implements Persistent { * The value for the per_create_date field. * @var int */ - protected $per_create_date = 943934400; + protected $per_create_date; /** * The value for the per_update_date field. * @var int */ - protected $per_update_date = 943934400; + protected $per_update_date; /** @@ -250,7 +250,7 @@ abstract class BasePermissions extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->per_create_date !== $ts || $ts === 943934400) { + if ($this->per_create_date !== $ts) { $this->per_create_date = $ts; $this->modifiedColumns[] = PermissionsPeer::PER_CREATE_DATE; } @@ -274,7 +274,7 @@ abstract class BasePermissions extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->per_update_date !== $ts || $ts === 943934400) { + if ($this->per_update_date !== $ts) { $this->per_update_date = $ts; $this->modifiedColumns[] = PermissionsPeer::PER_UPDATE_DATE; } diff --git a/rbac/engine/classes/model/om/BaseRbacUsers.php b/rbac/engine/classes/model/om/BaseRbacUsers.php index c8263bc17..64dd0f2e8 100644 --- a/rbac/engine/classes/model/om/BaseRbacUsers.php +++ b/rbac/engine/classes/model/om/BaseRbacUsers.php @@ -74,21 +74,21 @@ abstract class BaseRbacUsers extends BaseObject implements Persistent { * The value for the usr_due_date field. * @var int */ - protected $usr_due_date = 943934400; + protected $usr_due_date; /** * The value for the usr_create_date field. * @var int */ - protected $usr_create_date = 943934400; + protected $usr_create_date; /** * The value for the usr_update_date field. * @var int */ - protected $usr_update_date = 943934400; + protected $usr_update_date; /** @@ -502,7 +502,7 @@ abstract class BaseRbacUsers extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->usr_due_date !== $ts || $ts === 943934400) { + if ($this->usr_due_date !== $ts) { $this->usr_due_date = $ts; $this->modifiedColumns[] = RbacUsersPeer::USR_DUE_DATE; } @@ -526,7 +526,7 @@ abstract class BaseRbacUsers extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->usr_create_date !== $ts || $ts === 943934400) { + if ($this->usr_create_date !== $ts) { $this->usr_create_date = $ts; $this->modifiedColumns[] = RbacUsersPeer::USR_CREATE_DATE; } @@ -550,7 +550,7 @@ abstract class BaseRbacUsers extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->usr_update_date !== $ts || $ts === 943934400) { + if ($this->usr_update_date !== $ts) { $this->usr_update_date = $ts; $this->modifiedColumns[] = RbacUsersPeer::USR_UPDATE_DATE; } diff --git a/rbac/engine/classes/model/om/BaseRoles.php b/rbac/engine/classes/model/om/BaseRoles.php index bd760c110..a5c273665 100644 --- a/rbac/engine/classes/model/om/BaseRoles.php +++ b/rbac/engine/classes/model/om/BaseRoles.php @@ -60,14 +60,14 @@ abstract class BaseRoles extends BaseObject implements Persistent { * The value for the rol_create_date field. * @var int */ - protected $rol_create_date = 943934400; + protected $rol_create_date; /** * The value for the rol_update_date field. * @var int */ - protected $rol_update_date = 943934400; + protected $rol_update_date; /** @@ -312,7 +312,7 @@ abstract class BaseRoles extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->rol_create_date !== $ts || $ts === 943934400) { + if ($this->rol_create_date !== $ts) { $this->rol_create_date = $ts; $this->modifiedColumns[] = RolesPeer::ROL_CREATE_DATE; } @@ -336,7 +336,7 @@ abstract class BaseRoles extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->rol_update_date !== $ts || $ts === 943934400) { + if ($this->rol_update_date !== $ts) { $this->rol_update_date = $ts; $this->modifiedColumns[] = RolesPeer::ROL_UPDATE_DATE; } diff --git a/rbac/engine/classes/model/om/BaseSystems.php b/rbac/engine/classes/model/om/BaseSystems.php index ef6c5e567..8ebfd717b 100644 --- a/rbac/engine/classes/model/om/BaseSystems.php +++ b/rbac/engine/classes/model/om/BaseSystems.php @@ -46,14 +46,14 @@ abstract class BaseSystems extends BaseObject implements Persistent { * The value for the sys_create_date field. * @var int */ - protected $sys_create_date = 943934400; + protected $sys_create_date; /** * The value for the sys_update_date field. * @var int */ - protected $sys_update_date = 943934400; + protected $sys_update_date; /** @@ -232,7 +232,7 @@ abstract class BaseSystems extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->sys_create_date !== $ts || $ts === 943934400) { + if ($this->sys_create_date !== $ts) { $this->sys_create_date = $ts; $this->modifiedColumns[] = SystemsPeer::SYS_CREATE_DATE; } @@ -256,7 +256,7 @@ abstract class BaseSystems extends BaseObject implements Persistent { } else { $ts = $v; } - if ($this->sys_update_date !== $ts || $ts === 943934400) { + if ($this->sys_update_date !== $ts) { $this->sys_update_date = $ts; $this->modifiedColumns[] = SystemsPeer::SYS_UPDATE_DATE; } diff --git a/rbac/engine/config/schema.xml b/rbac/engine/config/schema.xml index 3f3c3c7ce..2fc6b8b87 100644 --- a/rbac/engine/config/schema.xml +++ b/rbac/engine/config/schema.xml @@ -23,8 +23,8 @@ - - + + @@ -53,8 +53,8 @@ - - + + @@ -104,8 +104,8 @@ - - + +
@@ -135,9 +135,9 @@ - - - + + + diff --git a/rbac/engine/data/mysql/schema.sql b/rbac/engine/data/mysql/schema.sql index cd005fae3..70bb48b12 100644 --- a/rbac/engine/data/mysql/schema.sql +++ b/rbac/engine/data/mysql/schema.sql @@ -14,8 +14,8 @@ CREATE TABLE `PERMISSIONS` ( `PER_UID` VARCHAR(32) default '' NOT NULL, `PER_CODE` VARCHAR(32) default '' NOT NULL, - `PER_CREATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, - `PER_UPDATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, + `PER_CREATE_DATE` DATETIME, + `PER_UPDATE_DATE` DATETIME, `PER_STATUS` INTEGER default 1 NOT NULL, `PER_SYSTEM` VARCHAR(32) default '00000000000000000000000000000002' NOT NULL, PRIMARY KEY (`PER_UID`) @@ -33,8 +33,8 @@ CREATE TABLE `ROLES` `ROL_PARENT` VARCHAR(32) default '' NOT NULL, `ROL_SYSTEM` VARCHAR(32) default '' NOT NULL, `ROL_CODE` VARCHAR(32) default '' NOT NULL, - `ROL_CREATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, - `ROL_UPDATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, + `ROL_CREATE_DATE` DATETIME, + `ROL_UPDATE_DATE` DATETIME, `ROL_STATUS` INTEGER default 1 NOT NULL, PRIMARY KEY (`ROL_UID`) )ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Roles'; @@ -62,8 +62,8 @@ CREATE TABLE `SYSTEMS` ( `SYS_UID` VARCHAR(32) default '' NOT NULL, `SYS_CODE` VARCHAR(32) default '' NOT NULL, - `SYS_CREATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, - `SYS_UPDATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, + `SYS_CREATE_DATE` DATETIME, + `SYS_UPDATE_DATE` DATETIME, `SYS_STATUS` INTEGER default 0 NOT NULL, PRIMARY KEY (`SYS_UID`) )ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Systems'; @@ -82,9 +82,9 @@ CREATE TABLE `USERS` `USR_FIRSTNAME` VARCHAR(50) default '' NOT NULL, `USR_LASTNAME` VARCHAR(50) default '' NOT NULL, `USR_EMAIL` VARCHAR(100) default '' NOT NULL, - `USR_DUE_DATE` DATE default '0000-00-00' NOT NULL, - `USR_CREATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, - `USR_UPDATE_DATE` DATETIME default '0000-00-00 00:00:00' NOT NULL, + `USR_DUE_DATE` DATE NOT NULL, + `USR_CREATE_DATE` DATETIME, + `USR_UPDATE_DATE` DATETIME, `USR_STATUS` INTEGER default 1 NOT NULL, `USR_AUTH_TYPE` VARCHAR(32) default '' NOT NULL, `UID_AUTH_SOURCE` VARCHAR(32) default '' NOT NULL,