details: /erp/devel/pi/rev/391825256589
changeset: 6690:391825256589
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Mar 12 13:14:36 2010 +0100
summary: fixed bug 12601: Is not possible to delete a window tab using
postgresql
diffstat:
src-db/database/model/tables/AD_MODEL_OBJECT.xml | 4 ++--
src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml | 2 +-
src-db/database/model/triggers/AD_REFERENCE_TRG2.xml | 12 ++----------
src-db/database/model/triggers/AD_TAB_TRG2.xml | 10 ++--------
4 files changed, 7 insertions(+), 21 deletions(-)
diffs (96 lines):
diff -r e6ff1e964bd7 -r 391825256589
src-db/database/model/tables/AD_MODEL_OBJECT.xml
--- a/src-db/database/model/tables/AD_MODEL_OBJECT.xml Fri Mar 12 13:13:33
2010 +0100
+++ b/src-db/database/model/tables/AD_MODEL_OBJECT.xml Fri Mar 12 13:14:36
2010 +0100
@@ -111,10 +111,10 @@
<foreign-key foreignTable="AD_PROCESS" name="AD_MODEL_OBJECT_AD_PROCESS">
<reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
</foreign-key>
- <foreign-key foreignTable="AD_REFERENCE"
name="AD_MODEL_OBJECT_AD_REFERENCE">
+ <foreign-key foreignTable="AD_REFERENCE"
name="AD_MODEL_OBJECT_AD_REFERENCE" onDelete="cascade">
<reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
</foreign-key>
- <foreign-key foreignTable="AD_TAB" name="AD_MODEL_OBJECT_AD_TAB">
+ <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">
diff -r e6ff1e964bd7 -r 391825256589
src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml Fri Mar 12
13:13:33 2010 +0100
+++ b/src-db/database/model/tables/AD_MODEL_OBJECT_MAPPING.xml Fri Mar 12
13:14:36 2010 +0100
@@ -48,7 +48,7 @@
<foreign-key foreignTable="AD_CLIENT"
name="AD_MODEL_OBJECT_MAPPING_AD_CLI">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
- <foreign-key foreignTable="AD_MODEL_OBJECT"
name="AD_MODEL_OBJECT_MAPPING_AD_MOD">
+ <foreign-key foreignTable="AD_MODEL_OBJECT"
name="AD_MODEL_OBJECT_MAPPING_AD_MOD" onDelete="cascade">
<reference local="AD_MODEL_OBJECT_ID" foreign="AD_MODEL_OBJECT_ID"/>
</foreign-key>
<foreign-key foreignTable="AD_ORG" name="AD_MODEL_OBJECT_MAPPING_AD_ORG">
diff -r e6ff1e964bd7 -r 391825256589
src-db/database/model/triggers/AD_REFERENCE_TRG2.xml
--- a/src-db/database/model/triggers/AD_REFERENCE_TRG2.xml Fri Mar 12
13:13:33 2010 +0100
+++ b/src-db/database/model/triggers/AD_REFERENCE_TRG2.xml Fri Mar 12
13:14:36 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<database name="TRIGGER AD_REFERENCE_TRG2">
- <trigger name="AD_REFERENCE_TRG2" table="AD_REFERENCE" fires="after"
insert="true" update="false" delete="true" foreach="row">
+ <trigger name="AD_REFERENCE_TRG2" table="AD_REFERENCE" fires="after"
insert="true" update="true" delete="false" foreach="row">
<body><![CDATA[
@@ -18,7 +18,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2009 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -32,14 +32,6 @@
IF AD_isTriggerEnabled()='N' THEN RETURN;
END IF;
- IF (DELETING) THEN
- IF :OLD.PARENTREFERENCE_ID='30' AND :OLD.ISACTIVE='Y' THEN
- DELETE FROM AD_MODEL_OBJECT_MAPPING WHERE AD_MODEL_OBJECT_ID IN (
- SELECT AD_MODEL_OBJECT_ID FROM AD_MODEL_OBJECT WHERE
AD_MODEL_OBJECT.AD_REFERENCE_ID=:old.AD_REFERENCE_ID AND ACTION = 'S');
- DELETE FROM AD_MODEL_OBJECT WHERE ACTION = 'S' AND
AD_MODEL_OBJECT.AD_REFERENCE_ID = :OLD.AD_REFERENCE_ID;
- END IF;
- END IF;
-
IF (INSERTING) THEN
IF :NEW.PARENTREFERENCE_ID='30' AND :NEW.ISACTIVE='Y' THEN
IF :new.AD_Module_ID != '0' THEN
diff -r e6ff1e964bd7 -r 391825256589
src-db/database/model/triggers/AD_TAB_TRG2.xml
--- a/src-db/database/model/triggers/AD_TAB_TRG2.xml Fri Mar 12 13:13:33
2010 +0100
+++ b/src-db/database/model/triggers/AD_TAB_TRG2.xml Fri Mar 12 13:14:36
2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<database name="TRIGGER AD_TAB_TRG2">
- <trigger name="AD_TAB_TRG2" table="AD_TAB" fires="after" insert="true"
update="true" delete="true" foreach="row">
+ <trigger name="AD_TAB_TRG2" table="AD_TAB" fires="after" insert="true"
update="true" delete="false" foreach="row">
<body><![CDATA[
@@ -18,7 +18,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2009 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
@@ -241,12 +241,6 @@
END IF;
- IF (DELETING) THEN
- DELETE FROM AD_MODEL_OBJECT_MAPPING WHERE AD_MODEL_OBJECT_ID IN (
- SELECT AD_MODEL_OBJECT_ID FROM AD_MODEL_OBJECT WHERE
AD_MODEL_OBJECT.AD_TAB_ID=:old.AD_TAB_ID AND ACTION = 'W');
- DELETE FROM AD_MODEL_OBJECT WHERE ACTION = 'W' AND AD_MODEL_OBJECT.AD_TAB_ID
= :OLD.AD_TAB_ID;
- END IF;
-
IF (INSERTING) THEN
SELECT W.IsActive, (CASE WHEN M.AD_MODULE_ID ='0' THEN NULL ELSE
JavaPackage END)
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
