Make sure upgrade uses the same schema as installation.

- Removed vendor info in fields from schema.xml
- Mapped VARLONGCHAR to mediumtext
- Database upgrades now uses field attributes instead of vendor info.
- Updated app_cache_view files to conform to schema.sql
This commit is contained in:
Alexandre Rosenfeld
2011-02-24 16:21:26 +00:00
parent 7e655b2cee
commit b9a1aea8d3
13 changed files with 954 additions and 6691 deletions

View File

@@ -38,7 +38,7 @@ class MysqlPlatform extends DefaultPlatform {
{
parent::initialize();
$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "DECIMAL"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "MEDIUMTEXT"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "DATETIME"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_TIMESTAMP, "DATETIME"));
$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BLOB"));

File diff suppressed because one or more lines are too long

View File

@@ -21,66 +21,12 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Permissions"/>
</vendor>
<column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="PER_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_CODE" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="PER_CODE"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="PER_CREATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="PER_UPDATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_STATUS" type="INTEGER" required="true" default="1">
<vendor type="mysql">
<parameter name="Field" value="PER_STATUS"/>
<parameter name="Type" value="int(11)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="1"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_SYSTEM" type="VARCHAR" size="32" required="true" default="00000000000000000000000000000002">
<vendor type="mysql">
<parameter name="Field" value="PER_SYSTEM"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="00000000000000000000000000000002"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="PER_CODE" type="VARCHAR" size="32" required="true" default="" />
<column name="PER_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="PER_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="PER_STATUS" type="INTEGER" required="true" default="1" />
<column name="PER_SYSTEM" type="VARCHAR" size="32" required="true" default="00000000000000000000000000000002" />
</table>
<table name="ROLES">
<vendor type="mysql">
@@ -103,76 +49,13 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Roles"/>
</vendor>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_PARENT" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_PARENT"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_SYSTEM" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_SYSTEM"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_CODE" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_CODE"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="ROL_CREATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="ROL_UPDATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_STATUS" type="INTEGER" required="true" default="1">
<vendor type="mysql">
<parameter name="Field" value="ROL_STATUS"/>
<parameter name="Type" value="int(11)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="1"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="ROL_PARENT" type="VARCHAR" size="32" required="true" default="" />
<column name="ROL_SYSTEM" type="VARCHAR" size="32" required="true" default="" />
<column name="ROL_CODE" type="VARCHAR" size="32" required="true" default="" />
<column name="ROL_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="ROL_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="ROL_STATUS" type="INTEGER" required="true" default="1" />
</table>
<table name="ROLES_PERMISSIONS">
<vendor type="mysql">
@@ -195,26 +78,8 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Permissions of the roles"/>
</vendor>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="PER_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
</table>
<table name="SYSTEMS">
<vendor type="mysql">
@@ -237,56 +102,11 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Systems"/>
</vendor>
<column name="SYS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="SYS_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="SYS_CODE" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="SYS_CODE"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="SYS_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="SYS_CREATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="SYS_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="SYS_UPDATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="SYS_STATUS" type="INTEGER" required="true" default="0">
<vendor type="mysql">
<parameter name="Field" value="SYS_STATUS"/>
<parameter name="Type" value="int(11)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="SYS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="SYS_CODE" type="VARCHAR" size="32" required="true" default="" />
<column name="SYS_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="SYS_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="SYS_STATUS" type="INTEGER" required="true" default="0" />
</table>
<table name="RBAC_USERS">
<vendor type="mysql">
@@ -309,148 +129,21 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Users"/>
</vendor>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_USERNAME" type="VARCHAR" size="100" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_USERNAME"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_PASSWORD" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_PASSWORD"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_FIRSTNAME" type="VARCHAR" size="50" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_FIRSTNAME"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_LASTNAME" type="VARCHAR" size="50" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_LASTNAME"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_EMAIL" type="VARCHAR" size="100" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_EMAIL"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_DUE_DATE" type="DATE" required="true" default="0000-00-00">
<vendor type="mysql">
<parameter name="Field" value="USR_DUE_DATE"/>
<parameter name="Type" value="date"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="USR_CREATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00">
<vendor type="mysql">
<parameter name="Field" value="USR_UPDATE_DATE"/>
<parameter name="Type" value="datetime"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0000-00-00 00:00:00"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_STATUS" type="INTEGER" required="true" default="1">
<vendor type="mysql">
<parameter name="Field" value="USR_STATUS"/>
<parameter name="Type" value="int(11)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="1"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_AUTH_TYPE" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_AUTH_TYPE"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="UID_AUTH_SOURCE" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="UID_AUTH_SOURCE"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_AUTH_USER_DN" type="VARCHAR" size="255" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_AUTH_USER_DN"/>
<parameter name="Type" value="varchar(255)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_AUTH_SUPERVISOR_DN" type="VARCHAR" size="255" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_AUTH_SUPERVISOR_DN"/>
<parameter name="Type" value="varchar(255)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="USR_USERNAME" type="VARCHAR" size="100" required="true" default="" />
<column name="USR_PASSWORD" type="VARCHAR" size="32" required="true" default="" />
<column name="USR_FIRSTNAME" type="VARCHAR" size="50" required="true" default="" />
<column name="USR_LASTNAME" type="VARCHAR" size="50" required="true" default="" />
<column name="USR_EMAIL" type="VARCHAR" size="100" required="true" default="" />
<column name="USR_DUE_DATE" type="DATE" required="true" default="0000-00-00" />
<column name="USR_CREATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="USR_UPDATE_DATE" type="TIMESTAMP" required="true" default="0000-00-00 00:00:00" />
<column name="USR_STATUS" type="INTEGER" required="true" default="1" />
<column name="USR_AUTH_TYPE" type="VARCHAR" size="32" required="true" default="" />
<column name="UID_AUTH_SOURCE" type="VARCHAR" size="32" required="true" default="" />
<column name="USR_AUTH_USER_DN" type="VARCHAR" size="255" required="true" default="" />
<column name="USR_AUTH_SUPERVISOR_DN" type="VARCHAR" size="255" required="true" default="" />
</table>
<table name="USERS_ROLES">
<vendor type="mysql">
<parameter name="Name" value="USERS_ROLES"/>
@@ -472,26 +165,8 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value="Roles of the users"/>
</vendor>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="USR_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="ROL_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
</table>
<table name="AUTHENTICATION_SOURCE">
<vendor type="mysql">
@@ -514,145 +189,19 @@
<parameter name="Create_options" value=""/>
<parameter name="Comment" value=""/>
</vendor>
<column name="AUTH_SOURCE_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_UID"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value="PRI"/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_NAME" type="VARCHAR" size="50" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_NAME"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_PROVIDER" type="VARCHAR" size="20" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_PROVIDER"/>
<parameter name="Type" value="varchar(20)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_SERVER_NAME" type="VARCHAR" size="50" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_SERVER_NAME"/>
<parameter name="Type" value="varchar(50)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_PORT" type="INTEGER" default="389">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_PORT"/>
<parameter name="Type" value="int(11)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="389"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_ENABLED_TLS" type="INTEGER" default="0">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_ENABLED_TLS"/>
<parameter name="Type" value="int(1)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_VERSION" type="VARCHAR" size="16" required="true" default="3">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_VERSION"/>
<parameter name="Type" value="varchar(16)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="3"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_BASE_DN" type="VARCHAR" size="128" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_BASE_DN"/>
<parameter name="Type" value="varchar(128)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_ANONYMOUS" type="INTEGER" default="0">
<vendor type="mysql">
<parameter name="Field" value="AUTH_ANONYMOUS"/>
<parameter name="Type" value="int(1)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value="0"/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_SEARCH_USER" type="VARCHAR" size="128" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_SEARCH_USER"/>
<parameter name="Type" value="varchar(128)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_PASSWORD" type="VARCHAR" size="32" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_PASSWORD"/>
<parameter name="Type" value="varchar(32)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_ATTRIBUTES" type="VARCHAR" size="255" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_ATTRIBUTES"/>
<parameter name="Type" value="varchar(255)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_OBJECT_CLASSES" type="VARCHAR" size="255" required="true" default="">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_OBJECT_CLASSES"/>
<parameter name="Type" value="varchar(255)"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_DATA" type="LONGVARCHAR">
<vendor type="mysql">
<parameter name="Field" value="AUTH_SOURCE_DATA"/>
<parameter name="Type" value="text"/>
<parameter name="Null" value="NO"/>
<parameter name="Key" value=""/>
<parameter name="Default" value=""/>
<parameter name="Extra" value=""/>
</vendor>
</column>
<column name="AUTH_SOURCE_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="AUTH_SOURCE_NAME" type="VARCHAR" size="50" required="true" default="" />
<column name="AUTH_SOURCE_PROVIDER" type="VARCHAR" size="20" required="true" default="" />
<column name="AUTH_SOURCE_SERVER_NAME" type="VARCHAR" size="50" required="true" default="" />
<column name="AUTH_SOURCE_PORT" type="INTEGER" default="389" />
<column name="AUTH_SOURCE_ENABLED_TLS" type="INTEGER" default="0" />
<column name="AUTH_SOURCE_VERSION" type="VARCHAR" size="16" required="true" default="3" />
<column name="AUTH_SOURCE_BASE_DN" type="VARCHAR" size="128" required="true" default="" />
<column name="AUTH_ANONYMOUS" type="INTEGER" default="0" />
<column name="AUTH_SOURCE_SEARCH_USER" type="VARCHAR" size="128" required="true" default="" />
<column name="AUTH_SOURCE_PASSWORD" type="VARCHAR" size="32" required="true" default="" />
<column name="AUTH_SOURCE_ATTRIBUTES" type="VARCHAR" size="255" required="true" default="" />
<column name="AUTH_SOURCE_OBJECT_CLASSES" type="VARCHAR" size="255" required="true" default="" />
<column name="AUTH_SOURCE_DATA" type="LONGVARCHAR" />
</table>
</database>
</database>

View File

@@ -127,7 +127,7 @@ CREATE TABLE `AUTHENTICATION_SOURCE`
`AUTH_SOURCE_PASSWORD` VARCHAR(32) default '' NOT NULL,
`AUTH_SOURCE_ATTRIBUTES` VARCHAR(255) default '' NOT NULL,
`AUTH_SOURCE_OBJECT_CLASSES` VARCHAR(255) default '' NOT NULL,
`AUTH_SOURCE_DATA` TEXT,
`AUTH_SOURCE_DATA` MEDIUMTEXT,
PRIMARY KEY (`AUTH_SOURCE_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier

View File

@@ -93,6 +93,7 @@ function run_upgrade($command, $args) {
$workspaces = get_workspaces_from_args($args);
$count = count($workspaces);
$first = true;
$errors = false;
foreach ($workspaces as $index => $workspace) {
try {
CLI::logging("Upgrading workspaces ($index/$count): " . CLI::info($workspace->name) . "\n");
@@ -101,9 +102,15 @@ function run_upgrade($command, $args) {
$first = false;
} catch (Exception $e) {
CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
$errors = true;
}
}
CLI::logging("Upgrade successful\n");
if ($errors) {
CLI::logging("Upgrade finished but there were errors upgrading workspaces.\n");
CLI::logging(CLI::error("Please check the log above to correct any issues.")."\n");
} else {
CLI::logging("Upgrade successful\n");
}
}
?>

View File

@@ -689,7 +689,20 @@ class System {
* @return $sContent
*/
public static function getSchema($sSchemaFile) {
$dbAdapter = "mysql";
/* This is the MySQL mapping that Propel uses (from MysqlPlatform.php) */
$mysqlTypes = array(
'NUMERIC' => "DECIMAL",
'LONGVARCHAR' => "MEDIUMTEXT",
'TIMESTAMP' => "DATETIME",
'BU_TIMESTAMP' => "DATETIME",
'BINARY' => "BLOB",
'VARBINARY' => "MEDIUMBLOB",
'LONGVARBINARY' => "LONGBLOB",
'BLOB' => "LONGBLOB",
'CLOB' => "LONGTEXT",
/* This is not from Propel, but is required to get INT right */
'INTEGER' => "INT");
$aSchema = array();
$oXml = new DomDocument();
$oXml->load($sSchemaFile);
@@ -701,24 +714,42 @@ class System {
$aColumns = $oTable->getElementsByTagName('column');
foreach ($aColumns as $oColumn) {
$sColumName = $oColumn->getAttribute('name');
$aSchema[$sTableName][$sColumName] = array();
$aVendors = $oColumn->getElementsByTagName('vendor');
foreach ($aVendors as $oVendor) {
if ($oVendor->getAttribute('type') == $dbAdapter) {
break;
}
}
$aParameters = $oColumn->getElementsByTagName('parameter');
foreach ($aParameters as $oParameter) {
$parameterName = ucwords($oParameter->getAttribute('name'));
if ( $parameterName == 'Key' && strtoupper($oParameter->getAttribute('value')) == 'PRI' ) {
$aPrimaryKeys[] = $oColumn->getAttribute('name');
}
if ( in_array ( $parameterName, array('Field','Type','Null','Default') ) ) {
$aSchema[$sTableName][$sColumName][$parameterName] = $oParameter->getAttribute('value');
}
}
/* Get the field type. Propel uses VARCHAR if nothing else is specified */
$type = $oColumn->hasAttribute('type') ? strtoupper($oColumn->getAttribute('type')) : "VARCHAR";
/* Convert type to MySQL type according to Propel */
if (array_key_exists($type, $mysqlTypes))
$type = $mysqlTypes[$type];
$size = $oColumn->hasAttribute('size') ? $oColumn->getAttribute('size') : NULL;
/* Add default sizes from MySQL */
if ($type == "TINYINT" && !$size)
$size = "4";
if ($type == "INT" && !$size)
$size = "11";
if ($size)
$type = "$type($size)";
$required = $oColumn->hasAttribute('required') ? $oColumn->getAttribute('required') : NULL;
/* Convert $required to a bool */
$required = (in_array (strtolower ($required), array('1', 'true')));
$default = $oColumn->hasAttribute('default') ? $oColumn->getAttribute('default') : NULL;
$primaryKey = $oColumn->hasAttribute('primaryKey') ? $oColumn->getAttribute('primaryKey') : NULL;
/* Convert $primaryKey to a bool */
$primaryKey = (in_array (strtolower ($primaryKey), array('1', 'true')));
if ($primaryKey)
$aPrimaryKeys[] = $sColumName;
$aSchema[$sTableName][$sColumName] = array(
'Field' => $sColumName,
'Type' => $type,
'Null' => $required ? "NO" : "YES",
'Default' => $default
);
}
if ( is_array($aPrimaryKeys) && count($aPrimaryKeys) > 0 ) {
@@ -808,14 +839,16 @@ class System {
$changeDefaultAttr = false;
//#1067 - Invalid default value for int field
if ( substr($newField['Type'], 0, 3 ) && isset($newField['Default']) && $newField['Default']== '' )
if ( substr($newField['Type'], 0, 3 ) == "int" && isset($newField['Default']) && $newField['Default']== '' )
$changeDefaultAttr = false;
//if any difference exists, then insert the difference in aChanges
if ( $newField['Field'] != $oldField['Field'] ||
$newField['Type'] != $oldField['Type'] ||
$newField['Null'] != $oldField['Null'] ||
if ( strcasecmp($newField['Field'], $oldField['Field']) !== 0 ||
strcasecmp($newField['Type'], $oldField['Type']) !== 0 ||
strcasecmp($newField['Null'], $oldField['Null']) !== 0 ||
$changeDefaultAttr ) {
var_dump("Found in DB: ", $aOldSchema[$sTableName][$sColumName]);
var_dump("Should be: ", $aNewSchema[$sTableName][$sColumName]);
if (!isset($aChanges['tablesToAlter'][$sTableName])) {
$aChanges['tablesToAlter'][$sTableName] = array('DROP' => array(), 'ADD' => array(), 'CHANGE' => array());
}

View File

@@ -470,7 +470,8 @@ class workspaceTools {
*/
public function upgradeDatabase($checkOnly = false) {
$systemSchema = System::getSystemSchema();
return $this->upgradeSchema($systemSchema);
$this->upgradeSchema($systemSchema);
return true;
}

View File

@@ -110,11 +110,11 @@ class AppCacheViewMapBuilder {
$tMap->addColumn('DEL_DELAY_DURATION', 'DelDelayDuration', 'double', CreoleTypes::DOUBLE, false, null);
$tMap->addColumn('DEL_STARTED', 'DelStarted', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('DEL_STARTED', 'DelStarted', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('DEL_FINISHED', 'DelFinished', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('DEL_FINISHED', 'DelFinished', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('DEL_DELAYED', 'DelDelayed', 'int', CreoleTypes::TINYINT, false, null);
$tMap->addColumn('DEL_DELAYED', 'DelDelayed', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);

View File

@@ -94,7 +94,7 @@ class ApplicationMapBuilder {
$tMap->addColumn('APP_DATA', 'AppData', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('APP_PIN', 'AppPin', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('APP_PIN', 'AppPin', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addValidator('APP_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'DRAFT|TO_DO|PAUSED|COMPLETED|CANCELLED', 'Please select a valid status.');

File diff suppressed because it is too large Load Diff

View File

@@ -26,8 +26,8 @@ CREATE TABLE `APPLICATION`
`APP_INIT_DATE` DATETIME NOT NULL,
`APP_FINISH_DATE` DATETIME NOT NULL,
`APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_DATA` TEXT NOT NULL,
`APP_PIN` VARCHAR(32) default '',
`APP_DATA` MEDIUMTEXT NOT NULL,
`APP_PIN` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`APP_UID`),
KEY `indexApp`(`PRO_UID`, `APP_STATUS`, `APP_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='The application';
@@ -60,7 +60,7 @@ CREATE TABLE `APP_DELEGATION`
`DEL_STARTED` TINYINT default 0,
`DEL_FINISHED` TINYINT default 0,
`DEL_DELAYED` TINYINT default 0,
`DEL_DATA` TEXT NOT NULL,
`DEL_DATA` MEDIUMTEXT NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE default 0 NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Delegation a task to user';
@@ -84,7 +84,7 @@ CREATE TABLE `APP_DOCUMENT`
`APP_DOC_INDEX` INTEGER NOT NULL,
`FOLDER_UID` VARCHAR(32) default '',
`APP_DOC_PLUGIN` VARCHAR(150) default '',
`APP_DOC_TAGS` TEXT,
`APP_DOC_TAGS` MEDIUMTEXT,
`APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL,
`APP_DOC_STATUS_DATE` DATETIME,
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`)
@@ -105,14 +105,14 @@ CREATE TABLE `APP_MESSAGE`
`APP_MSG_TYPE` VARCHAR(100) default '' NOT NULL,
`APP_MSG_SUBJECT` VARCHAR(150) default '' NOT NULL,
`APP_MSG_FROM` VARCHAR(100) default '' NOT NULL,
`APP_MSG_TO` TEXT NOT NULL,
`APP_MSG_BODY` TEXT NOT NULL,
`APP_MSG_TO` MEDIUMTEXT NOT NULL,
`APP_MSG_BODY` MEDIUMTEXT NOT NULL,
`APP_MSG_DATE` DATETIME NOT NULL,
`APP_MSG_CC` TEXT,
`APP_MSG_BCC` TEXT,
`APP_MSG_TEMPLATE` TEXT,
`APP_MSG_CC` MEDIUMTEXT,
`APP_MSG_BCC` MEDIUMTEXT,
`APP_MSG_TEMPLATE` MEDIUMTEXT,
`APP_MSG_STATUS` VARCHAR(20),
`APP_MSG_ATTACH` TEXT,
`APP_MSG_ATTACH` MEDIUMTEXT,
`APP_MSG_SEND_DATE` DATETIME NOT NULL,
PRIMARY KEY (`APP_MSG_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
@@ -141,7 +141,7 @@ CREATE TABLE `CONFIGURATION`
(
`CFG_UID` VARCHAR(32) default '' NOT NULL,
`OBJ_UID` VARCHAR(128) default '' NOT NULL,
`CFG_VALUE` TEXT NOT NULL,
`CFG_VALUE` MEDIUMTEXT NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
`APP_UID` VARCHAR(32) default '' NOT NULL,
@@ -160,7 +160,7 @@ CREATE TABLE `CONTENT`
`CON_PARENT` VARCHAR(32) default '' NOT NULL,
`CON_ID` VARCHAR(100) default '' NOT NULL,
`CON_LANG` VARCHAR(10) default '' NOT NULL,
`CON_VALUE` TEXT NOT NULL,
`CON_VALUE` MEDIUMTEXT NOT NULL,
PRIMARY KEY (`CON_CATEGORY`,`CON_PARENT`,`CON_ID`,`CON_LANG`),
KEY `indexUid`(`CON_ID`, `CON_CATEGORY`, `CON_LANG`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8';
@@ -254,8 +254,8 @@ CREATE TABLE `INPUT_DOCUMENT`
`INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL,
`INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL,
`INP_DOC_VERSIONING` TINYINT default 0 NOT NULL,
`INP_DOC_DESTINATION_PATH` TEXT,
`INP_DOC_TAGS` TEXT,
`INP_DOC_DESTINATION_PATH` MEDIUMTEXT,
`INP_DOC_TAGS` MEDIUMTEXT,
PRIMARY KEY (`INP_DOC_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Documentation required';
#-----------------------------------------------------------------------------
@@ -355,10 +355,10 @@ CREATE TABLE `OUTPUT_DOCUMENT`
`OUT_DOC_GENERATE` VARCHAR(10) default 'BOTH' NOT NULL,
`OUT_DOC_TYPE` VARCHAR(32) default 'HTML' NOT NULL,
`OUT_DOC_CURRENT_REVISION` INTEGER default 0,
`OUT_DOC_FIELD_MAPPING` TEXT,
`OUT_DOC_FIELD_MAPPING` MEDIUMTEXT,
`OUT_DOC_VERSIONING` TINYINT default 0 NOT NULL,
`OUT_DOC_DESTINATION_PATH` TEXT,
`OUT_DOC_TAGS` TEXT,
`OUT_DOC_DESTINATION_PATH` MEDIUMTEXT,
`OUT_DOC_TAGS` MEDIUMTEXT,
PRIMARY KEY (`OUT_DOC_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
@@ -485,7 +485,7 @@ CREATE TABLE `STEP`
`TAS_UID` VARCHAR(32) default '0' NOT NULL,
`STEP_TYPE_OBJ` VARCHAR(20) default 'DYNAFORM' NOT NULL,
`STEP_UID_OBJ` VARCHAR(32) default '0' NOT NULL,
`STEP_CONDITION` TEXT NOT NULL,
`STEP_CONDITION` MEDIUMTEXT NOT NULL,
`STEP_POSITION` INTEGER default 0 NOT NULL,
`STEP_MODE` VARCHAR(10) default 'EDIT',
PRIMARY KEY (`STEP_UID`)
@@ -620,8 +620,8 @@ CREATE TABLE `TRIGGERS`
`TRI_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`TRI_TYPE` VARCHAR(20) default 'SCRIPT' NOT NULL,
`TRI_WEBBOT` TEXT NOT NULL,
`TRI_PARAM` TEXT,
`TRI_WEBBOT` MEDIUMTEXT NOT NULL,
`TRI_PARAM` MEDIUMTEXT,
PRIMARY KEY (`TRI_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
@@ -825,7 +825,7 @@ CREATE TABLE `CASE_TRACKER_OBJECT`
`PRO_UID` VARCHAR(32) default '0' NOT NULL,
`CTO_TYPE_OBJ` VARCHAR(20) default 'DYNAFORM' NOT NULL,
`CTO_UID_OBJ` VARCHAR(32) default '0' NOT NULL,
`CTO_CONDITION` TEXT NOT NULL,
`CTO_CONDITION` MEDIUMTEXT NOT NULL,
`CTO_POSITION` INTEGER default 0 NOT NULL,
PRIMARY KEY (`CTO_UID`),
KEY `indexCaseTrackerObject`(`PRO_UID`, `CTO_UID_OBJ`)
@@ -864,8 +864,8 @@ CREATE TABLE `SUB_PROCESS`
`SP_SYNCHRONOUS` INTEGER default 0 NOT NULL,
`SP_SYNCHRONOUS_TYPE` VARCHAR(20) default '' NOT NULL,
`SP_SYNCHRONOUS_WAIT` INTEGER default 0 NOT NULL,
`SP_VARIABLES_OUT` TEXT NOT NULL,
`SP_VARIABLES_IN` TEXT NOT NULL,
`SP_VARIABLES_OUT` MEDIUMTEXT NOT NULL,
`SP_VARIABLES_IN` MEDIUMTEXT NOT NULL,
`SP_GRID_IN` VARCHAR(50) default '' NOT NULL,
PRIMARY KEY (`SP_UID`),
KEY `indexSubProcess`(`PRO_UID`, `PRO_PARENT`)
@@ -884,8 +884,8 @@ CREATE TABLE `SUB_APPLICATION`
`DEL_INDEX_PARENT` INTEGER default 0 NOT NULL,
`DEL_THREAD_PARENT` INTEGER default 0 NOT NULL,
`SA_STATUS` VARCHAR(32) default '' NOT NULL,
`SA_VALUES_OUT` TEXT NOT NULL,
`SA_VALUES_IN` TEXT NOT NULL,
`SA_VALUES_OUT` MEDIUMTEXT NOT NULL,
`SA_VALUES_IN` MEDIUMTEXT NOT NULL,
`SA_INIT_DATE` DATETIME,
`SA_FINISH_DATE` DATETIME,
PRIMARY KEY (`APP_UID`,`APP_PARENT`,`DEL_INDEX_PARENT`,`DEL_THREAD_PARENT`)
@@ -921,7 +921,7 @@ CREATE TABLE `USERS_PROPERTIES`
`USR_UID` VARCHAR(32) default '' NOT NULL,
`USR_LAST_UPDATE_DATE` DATETIME,
`USR_LOGGED_NEXT_TIME` INTEGER default 0,
`USR_PASSWORD_HISTORY` TEXT,
`USR_PASSWORD_HISTORY` MEDIUMTEXT,
PRIMARY KEY (`USR_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
@@ -936,7 +936,7 @@ CREATE TABLE `ADDITIONAL_TABLES`
`ADD_TAB_UID` VARCHAR(32) default '' NOT NULL,
`ADD_TAB_NAME` VARCHAR(60) default '' NOT NULL,
`ADD_TAB_CLASS_NAME` VARCHAR(100) default '' NOT NULL,
`ADD_TAB_DESCRIPTION` TEXT NOT NULL,
`ADD_TAB_DESCRIPTION` MEDIUMTEXT NOT NULL,
`ADD_TAB_SDW_LOG_INSERT` TINYINT default 1 NOT NULL,
`ADD_TAB_SDW_LOG_UPDATE` TINYINT default 1 NOT NULL,
`ADD_TAB_SDW_LOG_DELETE` TINYINT default 1 NOT NULL,
@@ -960,7 +960,7 @@ CREATE TABLE `FIELDS`
`ADD_TAB_UID` VARCHAR(32) default '' NOT NULL,
`FLD_INDEX` INTEGER default 1 NOT NULL,
`FLD_NAME` VARCHAR(60) default '' NOT NULL,
`FLD_DESCRIPTION` TEXT NOT NULL,
`FLD_DESCRIPTION` MEDIUMTEXT NOT NULL,
`FLD_TYPE` VARCHAR(10) default '' NOT NULL,
`FLD_SIZE` INTEGER default 1 NOT NULL,
`FLD_NULL` TINYINT default 1 NOT NULL,
@@ -982,7 +982,7 @@ CREATE TABLE `SHADOW_TABLE`
`SHD_UID` VARCHAR(32) default '' NOT NULL,
`ADD_TAB_UID` VARCHAR(32) default '' NOT NULL,
`SHD_ACTION` VARCHAR(10) default '' NOT NULL,
`SHD_DETAILS` TEXT NOT NULL,
`SHD_DETAILS` MEDIUMTEXT NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
`APP_UID` VARCHAR(32) default '' NOT NULL,
`SHD_DATE` DATETIME,
@@ -1010,8 +1010,8 @@ CREATE TABLE `EVENT`
`EVN_WHEN` DOUBLE default 0 NOT NULL,
`EVN_MAX_ATTEMPTS` TINYINT default 3 NOT NULL,
`EVN_ACTION` VARCHAR(50) default '' NOT NULL,
`EVN_CONDITIONS` TEXT,
`EVN_ACTION_PARAMETERS` TEXT,
`EVN_CONDITIONS` MEDIUMTEXT,
`EVN_ACTION_PARAMETERS` MEDIUMTEXT,
`TRI_UID` VARCHAR(32) default '',
`EVN_POSX` INTEGER default 0 NOT NULL,
`EVN_POSY` INTEGER default 0 NOT NULL,
@@ -1088,9 +1088,9 @@ CREATE TABLE `APP_CACHE_VIEW`
`DEL_DURATION` DOUBLE default 0,
`DEL_QUEUE_DURATION` DOUBLE default 0,
`DEL_DELAY_DURATION` DOUBLE default 0,
`DEL_STARTED` TINYINT default 0,
`DEL_FINISHED` TINYINT default 0,
`DEL_DELAYED` TINYINT default 0,
`DEL_STARTED` TINYINT default 0 NOT NULL,
`DEL_FINISHED` TINYINT default 0 NOT NULL,
`DEL_DELAYED` TINYINT default 0 NOT NULL,
`APP_CREATE_DATE` DATETIME NOT NULL,
`APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL,
@@ -1098,7 +1098,7 @@ CREATE TABLE `APP_CACHE_VIEW`
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`),
KEY `indexAppUser`(`USR_UID`, `APP_STATUS`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Delegation a task to user';
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Application cache view';
#-----------------------------------------------------------------------------
#-- DIM_TIME_DELEGATE
#-----------------------------------------------------------------------------
@@ -1154,7 +1154,7 @@ CREATE TABLE `APP_HISTORY`
`USR_UID` VARCHAR(32) default '' NOT NULL,
`APP_STATUS` VARCHAR(100) default '' NOT NULL,
`HISTORY_DATE` DATETIME,
`HISTORY_DATA` TEXT NOT NULL,
`HISTORY_DATA` MEDIUMTEXT NOT NULL,
KEY `indexAppHistory`(`APP_UID`, `TAS_UID`, `USR_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='History table for Dynaforms';
#-----------------------------------------------------------------------------
@@ -1168,7 +1168,7 @@ CREATE TABLE `APP_FOLDER`
(
`FOLDER_UID` VARCHAR(32) default '' NOT NULL,
`FOLDER_PARENT_UID` VARCHAR(32) default '' NOT NULL,
`FOLDER_NAME` TEXT NOT NULL,
`FOLDER_NAME` MEDIUMTEXT NOT NULL,
`FOLDER_CREATE_DATE` DATETIME NOT NULL,
`FOLDER_UPDATE_DATE` DATETIME NOT NULL,
PRIMARY KEY (`FOLDER_UID`)
@@ -1184,10 +1184,10 @@ CREATE TABLE `FIELD_CONDITION`
(
`FCD_UID` VARCHAR(32) default '' NOT NULL,
`FCD_FUNCTION` VARCHAR(50) NOT NULL,
`FCD_FIELDS` TEXT,
`FCD_CONDITION` TEXT,
`FCD_EVENTS` TEXT,
`FCD_EVENT_OWNERS` TEXT,
`FCD_FIELDS` MEDIUMTEXT,
`FCD_CONDITION` MEDIUMTEXT,
`FCD_EVENTS` MEDIUMTEXT,
`FCD_EVENT_OWNERS` MEDIUMTEXT,
`FCD_STATUS` VARCHAR(10),
`FCD_DYN_UID` VARCHAR(32) NOT NULL,
PRIMARY KEY (`FCD_UID`)
@@ -1209,8 +1209,8 @@ CREATE TABLE `LOG_CASES_SCHEDULER`
`EXEC_HOUR` VARCHAR(32) default '12:00' NOT NULL,
`RESULT` VARCHAR(32) default 'SUCCESS' NOT NULL,
`SCH_UID` VARCHAR(32) default 'OPEN' NOT NULL,
`WS_CREATE_CASE_STATUS` TEXT NOT NULL,
`WS_ROUTE_CASE_STATUS` TEXT NOT NULL,
`WS_CREATE_CASE_STATUS` MEDIUMTEXT NOT NULL,
`WS_ROUTE_CASE_STATUS` MEDIUMTEXT NOT NULL,
PRIMARY KEY (`LOG_CASE_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Cases Launched with Case Scheduler';
#-----------------------------------------------------------------------------
@@ -1263,7 +1263,7 @@ CREATE TABLE `CALENDAR_DEFINITION`
`CALENDAR_CREATE_DATE` DATETIME NOT NULL,
`CALENDAR_UPDATE_DATE` DATETIME,
`CALENDAR_WORK_DAYS` VARCHAR(100) default '' NOT NULL,
`CALENDAR_DESCRIPTION` TEXT NOT NULL,
`CALENDAR_DESCRIPTION` MEDIUMTEXT NOT NULL,
`CALENDAR_STATUS` VARCHAR(8) default 'ACTIVE' NOT NULL,
PRIMARY KEY (`CALENDAR_UID`)
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Calendar Definition used by PM';

View File

@@ -8,7 +8,7 @@ CREATE TABLE `APP_CACHE_VIEW`
`PREVIOUS_USR_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`DEL_DELEGATE_DATE` VARCHAR(10) default '' NOT NULL,
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_TASK_DUE_DATE` DATETIME,
`DEL_FINISH_DATE` DATETIME,
@@ -23,16 +23,15 @@ CREATE TABLE `APP_CACHE_VIEW`
`DEL_DURATION` DOUBLE default 0,
`DEL_QUEUE_DURATION` DOUBLE default 0,
`DEL_DELAY_DURATION` DOUBLE default 0,
`DEL_STARTED` TINYINT default 0,
`DEL_FINISHED` TINYINT default 0,
`DEL_DELAYED` TINYINT default 0,
`DEL_STARTED` TINYINT default 0 NOT NULL,
`DEL_FINISHED` TINYINT default 0 NOT NULL,
`DEL_DELAYED` TINYINT default 0 NOT NULL,
`APP_CREATE_DATE` DATETIME NOT NULL,
`APP_FINISH_DATE` DATETIME NULL,
`APP_FINISH_DATE` DATETIME,
`APP_UPDATE_DATE` DATETIME NOT NULL,
APP_OVERDUE_PERCENTAGE DOUBLE NOT NULL default 0,
APP_LAST_USER VARCHAR(128) default '' NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexAppNumber`(`APP_NUMBER`),
KEY `indexAppUser`(`USR_UID`, `APP_STATUS`)
)Type=MyISAM DEFAULT CHARSET='utf8' COMMENT='Application cache view';
)ENGINE=MyISAM DEFAULT CHARSET='utf8' COMMENT='Application cache view';

View File

@@ -33,8 +33,7 @@ SELECT
APPLICATION.APP_CREATE_DATE,
NULL,
APPLICATION.APP_UPDATE_DATE,
APP_DELEGATION.APP_OVERDUE_PERCENTAGE,
'-'
APP_DELEGATION.APP_OVERDUE_PERCENTAGE
FROM
APPLICATION
LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID)