details: /erp/devel/pi/rev/8f154dbdfd87
changeset: 12058:8f154dbdfd87
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon May 09 11:36:37 2011 +0200
summary: [cleanup] Readd 4 tables to core to allow updates from rc6.1 -> rc7
to succeed
- tables ad_task,ad_task_access,ad_workflow,ad_workflow_access readded
- two related columns in AD_MODEL_OBJECT readded
- ad_ definitions related to those elements readded
Those are needed as on upgrades via the UI the current loaded code still
references those tables and the last step 'Restart Tomcat' of the upgrade
will fail if they are missing.
diffstat:
src-db/database/model/tables/AD_MODEL_OBJECT.xml | 14 +
src-db/database/model/tables/AD_TASK.xml | 72 +
src-db/database/model/tables/AD_TASK_ACCESS.xml | 67 +
src-db/database/model/tables/AD_WORKFLOW.xml | 71 +
src-db/database/model/tables/AD_WORKFLOW_ACCESS.xml | 67 +
src-db/database/sourcedata/AD_COLUMN.xml | 1680 +++++++++++++++++++
src-db/database/sourcedata/AD_ELEMENT.xml | 61 +
src-db/database/sourcedata/AD_TABLE.xml | 88 +
8 files changed, 2120 insertions(+), 0 deletions(-)
diffs (truncated from 2344 to 300 lines):
diff -r 9abcb612de59 -r 8f154dbdfd87
src-db/database/model/tables/AD_MODEL_OBJECT.xml
--- a/src-db/database/model/tables/AD_MODEL_OBJECT.xml Mon May 09 10:58:54
2011 +0200
+++ b/src-db/database/model/tables/AD_MODEL_OBJECT.xml Mon May 09 11:36:37
2011 +0200
@@ -49,6 +49,14 @@
<default><![CDATA[N]]></default>
<onCreateDefault/>
</column>
+ <column name="AD_TASK_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_WORKFLOW_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<column name="AD_PROCESS_ID" primaryKey="false" required="false"
type="VARCHAR" size="32" autoIncrement="false">
<default/>
<onCreateDefault/>
@@ -109,6 +117,12 @@
<foreign-key foreignTable="AD_TAB" name="AD_MODEL_OBJECT_AD_TAB"
onDelete="cascade">
<reference local="AD_TAB_ID" foreign="AD_TAB_ID"/>
</foreign-key>
+ <foreign-key foreignTable="AD_TASK" name="AD_MODEL_OBJECT_AD_TASK">
+ <reference local="AD_TASK_ID" foreign="AD_TASK_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_WORKFLOW"
name="AD_MODEL_OBJECT_AD_WORKFLOW">
+ <reference local="AD_WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
+ </foreign-key>
<check name="AD_MODEL_OBJECT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
<check name="AD_MODEL_OBJECT_ISDEFAULT_CHK"><![CDATA[ISDEFAULT IN ('Y',
'N')]]></check>
</table>
diff -r 9abcb612de59 -r 8f154dbdfd87 src-db/database/model/tables/AD_TASK.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_TASK.xml Mon May 09 11:36:37 2011 +0200
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_TASK">
+ <table name="AD_TASK" primaryKey="AD_TASK_KEY">
+ <column name="AD_TASK_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="NAME" primaryKey="false" required="true" type="NVARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="255" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="HELP" primaryKey="false" required="false" type="NVARCHAR"
size="2000" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ACCESSLEVEL" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="OS_COMMAND" primaryKey="false" required="false"
type="NVARCHAR" size="2000" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="CLASSNAME" primaryKey="false" required="false"
type="NVARCHAR" size="100" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <foreign-key foreignTable="AD_CLIENT" name="AD_TASK_AD_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="AD_TASK_AD_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <unique name="AD_TASK_NAME">
+ <unique-column name="AD_CLIENT_ID"/>
+ <unique-column name="NAME"/>
+ </unique>
+ <check name="AD_TASK_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ </table>
+ </database>
diff -r 9abcb612de59 -r 8f154dbdfd87
src-db/database/model/tables/AD_TASK_ACCESS.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_TASK_ACCESS.xml Mon May 09 11:36:37
2011 +0200
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_TASK_ACCESS">
+ <table name="AD_TASK_ACCESS" primaryKey="AD_TASK_ACCESS_KEY">
+ <column name="AD_TASK_ACCESS_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault><![CDATA[get_uuid()]]></onCreateDefault>
+ </column>
+ <column name="AD_TASK_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ROLE_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISREADWRITE" primaryKey="false" required="true"
type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <foreign-key foreignTable="AD_ROLE" name="AD_TASK_ACCESS_AD_ROLE"
onDelete="cascade">
+ <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_TASK" name="AD_TASK_ACCESS_AD_TASK"
onDelete="cascade">
+ <reference local="AD_TASK_ID" foreign="AD_TASK_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_CLIENT" name="AD_TASKACCESS_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="AD_TASKACCESS_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <index name="AD_TASK_ACCESS_UN_KEY" unique="true">
+ <index-column name="AD_ROLE_ID"/>
+ <index-column name="AD_TASK_ID"/>
+ </index>
+ <check name="AD_TASK_ACCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ <check name="AD_TASK_ACCESS_ISREADWRITE_CHK"><![CDATA[ISREADWRITE IN
('Y', 'N')]]></check>
+ </table>
+ </database>
diff -r 9abcb612de59 -r 8f154dbdfd87
src-db/database/model/tables/AD_WORKFLOW.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_WORKFLOW.xml Mon May 09 11:36:37
2011 +0200
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_WORKFLOW">
+ <table name="AD_WORKFLOW" primaryKey="AD_WORKFLOW_KEY">
+ <column name="AD_WORKFLOW_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="NAME" primaryKey="false" required="true" type="NVARCHAR"
size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="DESCRIPTION" primaryKey="false" required="false"
type="NVARCHAR" size="255" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="HELP" primaryKey="false" required="false" type="NVARCHAR"
size="2000" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ACCESSLEVEL" primaryKey="false" required="true"
type="VARCHAR" size="60" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_MODULE_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default><![CDATA[0]]></default>
+ <onCreateDefault><![CDATA[SELECT AD_MODULE_ID FROM AD_MODULE WHERE
AD_MODULE_ID<>'0' AND TYPE='M']]></onCreateDefault>
+ </column>
+ <foreign-key foreignTable="AD_CLIENT" name="AD_WORKFLOW_AD_CLIENT">
+ <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_MODULE" name="AD_WORKFLOW_AD_MODULE">
+ <reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="AD_ORG" name="AD_WORKFLOW_AD_ORG">
+ <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+ </foreign-key>
+ <unique name="AD_WORKFLOW_NAME">
+ <unique-column name="AD_CLIENT_ID"/>
+ <unique-column name="NAME"/>
+ </unique>
+ <check name="AD_WORKFLOW_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y',
'N')]]></check>
+ </table>
+ </database>
diff -r 9abcb612de59 -r 8f154dbdfd87
src-db/database/model/tables/AD_WORKFLOW_ACCESS.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/AD_WORKFLOW_ACCESS.xml Mon May 09
11:36:37 2011 +0200
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+ <database name="TABLE AD_WORKFLOW_ACCESS">
+ <table name="AD_WORKFLOW_ACCESS" primaryKey="AD_WORKFLOW_ACCESS_KEY">
+ <column name="AD_WORKFLOW_ACCESS_ID" primaryKey="true" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault><![CDATA[get_uuid()]]></onCreateDefault>
+ </column>
+ <column name="AD_WORKFLOW_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ROLE_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_CLIENT_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AD_ORG_ID" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR"
size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="CREATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATED" primaryKey="false" required="true"
type="TIMESTAMP" size="7" autoIncrement="false">
+ <default><![CDATA[SYSDATE]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="UPDATEDBY" primaryKey="false" required="true"
type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
