details:   /erp/devel/pi/rev/6d1e9d000237
changeset: 8888:6d1e9d000237
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Nov 12 08:20:39 2010 +0100
summary:   [moduleMerge] Soft trigger disabling

details:   /erp/devel/pi/rev/5b21f179f4a2
changeset: 8889:5b21f179f4a2
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Nov 12 08:21:23 2010 +0100
summary:   [moduleMerge] Change merged_module_name column to nvarchar

diffstat:

 src-db/database/model/tables/AD_MODULE_MERGE.xml       |  2 +-
 src-db/database/model/triggers/AD_MODULE_MERGE_TRG.xml |  3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 0a6b57198f36 -r 5b21f179f4a2 
src-db/database/model/tables/AD_MODULE_MERGE.xml
--- a/src-db/database/model/tables/AD_MODULE_MERGE.xml  Fri Nov 12 10:36:42 
2010 +0530
+++ b/src-db/database/model/tables/AD_MODULE_MERGE.xml  Fri Nov 12 08:21:23 
2010 +0100
@@ -41,7 +41,7 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="MERGED_MODULE_NAME" primaryKey="false" required="true" 
type="VARCHAR" size="60" autoIncrement="false">
+      <column name="MERGED_MODULE_NAME" primaryKey="false" required="true" 
type="NVARCHAR" size="60" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
diff -r 0a6b57198f36 -r 5b21f179f4a2 
src-db/database/model/triggers/AD_MODULE_MERGE_TRG.xml
--- a/src-db/database/model/triggers/AD_MODULE_MERGE_TRG.xml    Fri Nov 12 
10:36:42 2010 +0530
+++ b/src-db/database/model/triggers/AD_MODULE_MERGE_TRG.xml    Fri Nov 12 
08:21:23 2010 +0100
@@ -22,6 +22,9 @@
   v_Aux  NUMBER;
    
 BEGIN
+
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
   
   SELECT COUNT(*)
     INTO v_Aux

------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to