From 1924725a64b86700ee76bb0c742b08f82ad8ff7a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 20 Apr 2007 18:32:00 +0000 Subject: [PATCH] Bug [ 1704261 ] can not import currency rate --- dbPort/src/org/compiere/dbPort/Convert.java | 2 +- dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dbPort/src/org/compiere/dbPort/Convert.java b/dbPort/src/org/compiere/dbPort/Convert.java index 05f26f7c76..462316b969 100644 --- a/dbPort/src/org/compiere/dbPort/Convert.java +++ b/dbPort/src/org/compiere/dbPort/Convert.java @@ -261,7 +261,7 @@ public abstract class Convert // Statements ending with / - String[] sql = tempResult.split("\\s/\\s"); // ("(;\\s)|(\\s/\\s)"); + String[] sql = tempResult.split("^/$"); // ("(;\\s)|(\\s/\\s)"); ArrayList result = new ArrayList (sql.length); // process statements for (int i = 0; i < sql.length; i++) diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java index 23a31fa246..3d5932c5e2 100644 --- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java +++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQLTest.java @@ -28,6 +28,12 @@ public final class Convert_PostgreSQLTest { String sqe; String[] r; + // [ 1704261 ] can not import currency rate + sql = "UPDATE I_Conversion_Rate i SET MultiplyRate = 1 / DivideRate WHERE (MultiplyRate IS NULL OR MultiplyRate = 0) AND DivideRate IS NOT NULL AND DivideRate<>0 AND I_IsImported<>'Y' AND AD_Client_ID=1000000"; + sqe = "UPDATE I_Conversion_Rate SET MultiplyRate = 1 / DivideRate WHERE (MultiplyRate IS NULL OR MultiplyRate = 0) AND DivideRate IS NOT NULL AND DivideRate<>0 AND I_IsImported<>'Y' AND AD_Client_ID=1000000"; + r = convert.convert(sql); + verify(sql, r, sqe); + //[ 1668720 ] Convert failing in alter table sql = "ALTER TABLE GT_TaxBase ADD CONSTRAINT GT_TaxBase_Key PRIMARY KEY (GT_TaxBase_ID)"; sqe = "ALTER TABLE GT_TaxBase ADD CONSTRAINT GT_TaxBase_Key PRIMARY KEY (GT_TaxBase_ID)";