midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ 1727193 ] Convert failed with decode in quoted string 

- more robust handling of quoted string in sql statement
- change to use junit test
- added test case for decode
This commit is contained in:
Heng Sin Low 2007-05-29 03:25:10 +00:00
parent a36682063b
commit 2c3b29a575
4 changed files with 226 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
base/src/org/compiere/dbPort/Convert.java
View File

@ -264,17 +264,21 @@ public abstract class Convert
* @param retVars * @param retVars
* @return string * @return string
*/ */
protected String replaceQuotedStrings(String retValue, Vector<String>retVars) { protected String replaceQuotedStrings(String inputValue, Vector<String>retVars) {
// save every value // save every value
// Carlos Ruiz - globalqss - better matching regexp // Carlos Ruiz - globalqss - better matching regexp
retVars.clear(); retVars.clear();
Pattern p = Pattern.compile("'[[^']*]*'"); Pattern p = Pattern.compile("'[[^']*]*'");
Matcher m = p.matcher(retValue); Matcher m = p.matcher(inputValue);
int i = 0;
StringBuffer retValue = new StringBuffer(inputValue.length());
while (m.find()) { while (m.find()) {
retVars.addElement(new String(retValue.substring(m.start(), m.end()))); retVars.addElement(new String(inputValue.substring(m.start(), m.end())));
m.appendReplacement(retValue, "<--" + i + "-->");
i++;
} }
retValue = m.replaceAll("<-->"); m.appendTail(retValue);
return retValue; return retValue.toString();
} }
/** /**
@ -284,18 +288,14 @@ public abstract class Convert
* @return string * @return string
*/ */
protected String recoverQuotedStrings(String retValue, Vector<String>retVars) { protected String recoverQuotedStrings(String retValue, Vector<String>retVars) {
Pattern p = Pattern.compile("<-->", Pattern.CASE_INSENSITIVE | Pattern.LITERAL);
Matcher m = p.matcher(retValue);
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
// Parse the string step by step - teo_sarca [ 1705768 ] for (int i = 0; i < retVars.size(); i++) {
for (int cont = 0; cont < retVars.size() && m.find(); cont++) {
//hengsin, special character in replacement can cause exception //hengsin, special character in replacement can cause exception
String replacement = (String) retVars.get(cont); String replacement = (String) retVars.get(i);
replacement = escapeQuotedString(replacement); replacement = escapeQuotedString(replacement);
m.appendReplacement(sb, Matcher.quoteReplacement(replacement)); retValue = retValue.replace("<--" + i + "-->", replacement);
} }
m.appendTail(sb); return retValue;
return sb.toString();
} }
/** /**
@ -362,13 +362,9 @@ public abstract class Convert
* @return string * @return string
*/ */
protected String convertWithConvertMap(String sqlStatement) { protected String convertWithConvertMap(String sqlStatement) {
/** Vector to save previous values of quoted strings **/
Vector<String> retVars = new Vector<String>();
try try
{ {
sqlStatement = replaceQuotedStrings(sqlStatement,retVars);
sqlStatement = applyConvertMap(cleanUpStatement(sqlStatement)); sqlStatement = applyConvertMap(cleanUpStatement(sqlStatement));
sqlStatement = recoverQuotedStrings(sqlStatement,retVars);
} }
catch (RuntimeException e) { catch (RuntimeException e) {
log.warning(e.getLocalizedMessage()); log.warning(e.getLocalizedMessage());

38
base/src/org/compiere/dbPort/Convert_PostgreSQL.java
View File

@ -71,39 +71,42 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
*/ */
protected ArrayList<String> convertStatement(String sqlStatement) { protected ArrayList<String> convertStatement(String sqlStatement) {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
/** Vector to save previous values of quoted strings **/
String statement = convertWithConvertMap(sqlStatement); Vector<String> retVars = new Vector<String>();
String statement = replaceQuotedStrings(sqlStatement, retVars);
statement = convertWithConvertMap(statement);
String cmpString = statement.toUpperCase(); String cmpString = statement.toUpperCase();
boolean isCreate = cmpString.startsWith("CREATE "); boolean isCreate = cmpString.startsWith("CREATE ");
// Process // Process
if (isCreate && cmpString.indexOf(" FUNCTION ") != -1) if (isCreate && cmpString.indexOf(" FUNCTION ") != -1)
result.add(statement); ;
else if (isCreate && cmpString.indexOf(" TRIGGER ") != -1) else if (isCreate && cmpString.indexOf(" TRIGGER ") != -1)
result.add(statement); ;
else if (isCreate && cmpString.indexOf(" PROCEDURE ") != -1) else if (isCreate && cmpString.indexOf(" PROCEDURE ") != -1)
result.add(statement); ;
else if (isCreate && cmpString.indexOf(" VIEW ") != -1) else if (isCreate && cmpString.indexOf(" VIEW ") != -1)
result.add(statement); ;
// begin vpj-cd e-evolution 02/24/2005 PostgreSQL
else if (cmpString.indexOf("ALTER TABLE") != -1) { else if (cmpString.indexOf("ALTER TABLE") != -1) {
result.add(convertDDL(convertComplexStatement(statement))); statement = convertDDL(convertComplexStatement(statement));
/* /*
} else if (cmpString.indexOf("ROWNUM") != -1) { } else if (cmpString.indexOf("ROWNUM") != -1) {
result.add(convertRowNum(convertComplexStatement(convertAlias(statement))));*/ result.add(convertRowNum(convertComplexStatement(convertAlias(statement))));*/
} else if (cmpString.indexOf("DELETE ") != -1 } else if (cmpString.indexOf("DELETE ") != -1
&& cmpString.indexOf("DELETE FROM") == -1) { && cmpString.indexOf("DELETE FROM") == -1) {
statement = convertDelete(statement); statement = convertDelete(statement);
result.add(convertComplexStatement(convertAlias(statement))); statement = convertComplexStatement(convertAlias(statement));
} else if (cmpString.indexOf("DELETE FROM") != -1) { } else if (cmpString.indexOf("DELETE FROM") != -1) {
result.add(convertComplexStatement(convertAlias(statement))); statement = convertComplexStatement(convertAlias(statement));
} else if (cmpString.indexOf("UPDATE ") != -1) { } else if (cmpString.indexOf("UPDATE ") != -1) {
result.add(convertComplexStatement(convertUpdate(convertAlias(statement)))); statement = convertComplexStatement(convertUpdate(convertAlias(statement)));
} else { } else {
result.add(convertComplexStatement(convertAlias(statement))); statement = convertComplexStatement(convertAlias(statement));
} }
// end vpj-cd e-evolution 02/24/2005 PostgreSQL statement = recoverQuotedStrings(statement, retVars);
result.add(statement);
return result; return result;
} // convertStatement } // convertStatement
@ -150,8 +153,13 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
StringBuffer sb = null; StringBuffer sb = null;
// Convert all decode parts // Convert all decode parts
while (retValue.toUpperCase().indexOf("DECODE") != -1) int found = retValue.toUpperCase().indexOf("DECODE");
retValue = convertDecode(retValue); int fromIndex = 0;
while ( found != -1) {
retValue = convertDecode(retValue, fromIndex);
fromIndex = found + 6;
found = retValue.toUpperCase().indexOf("DECODE", fromIndex);
}
// Outer Join Handling ----------------------------------------------- // Outer Join Handling -----------------------------------------------
int index = retValue.toUpperCase().indexOf("SELECT "); int index = retValue.toUpperCase().indexOf("SELECT ");

321
base/src/org/compiere/dbPort/Convert_PostgreSQLTest.java
View File

@ -13,22 +13,23 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.dbPort; package org.compiere.dbPort;
import junit.framework.TestCase;
/** /**
* Unit testing for Convert_PostgreSQL. Not using junit now as I do not want to * Unit testing for Convert_PostgreSQL.
* add more dependency to the project at this moment.
* @author Low Heng Sin * @author Low Heng Sin
* @version 20061225 * @version 20061225
*/ */
public final class Convert_PostgreSQLTest { public final class Convert_PostgreSQLTest extends TestCase{
private Convert_PostgreSQL convert = new Convert_PostgreSQL();
String sql;
String sqe;
String[] r;
public Convert_PostgreSQLTest() {} public Convert_PostgreSQLTest() {}
public void doTest() { //[ 1707959 ] Copy from other PrintFormat doesn't work anymore
Convert_PostgreSQL convert = new Convert_PostgreSQL(); public void test1707959() {
String sql;
String sqe;
String[] r;
//[ 1707959 ] Copy from other PrintFormat doesn't work anymore
sql = "UPDATE AD_PrintFormatItem_Trl new " + sql = "UPDATE AD_PrintFormatItem_Trl new " +
"SET (PrintName, PrintNameSuffix, IsTranslated) = (" + "SET (PrintName, PrintNameSuffix, IsTranslated) = (" +
"SELECT PrintName, PrintNameSuffix, IsTranslated " + "SELECT PrintName, PrintNameSuffix, IsTranslated " +
@ -42,91 +43,137 @@ public final class Convert_PostgreSQLTest {
" AND AD_PrintFormatItem_ID =2)"; " AND AD_PrintFormatItem_ID =2)";
sqe = "UPDATE AD_PrintFormatItem_Trl SET PrintName=\"old\".PrintName,PrintNameSuffix=\"old\".PrintNameSuffix,IsTranslated=\"old\".IsTranslated FROM AD_PrintFormatItem_Trl \"old\" WHERE \"old\".AD_Language=AD_PrintFormatItem_Trl.AD_Language AND \"old\".AD_PrintFormatItem_ID =0 AND AD_PrintFormatItem_Trl.AD_PrintFormatItem_ID=1 AND EXISTS (SELECT AD_PrintFormatItem_ID FROM AD_PrintFormatItem_trl \"old\" WHERE \"old\".AD_Language=AD_PrintFormatItem_Trl.AD_Language AND AD_PrintFormatItem_ID =2)"; sqe = "UPDATE AD_PrintFormatItem_Trl SET PrintName=\"old\".PrintName,PrintNameSuffix=\"old\".PrintNameSuffix,IsTranslated=\"old\".IsTranslated FROM AD_PrintFormatItem_Trl \"old\" WHERE \"old\".AD_Language=AD_PrintFormatItem_Trl.AD_Language AND \"old\".AD_PrintFormatItem_ID =0 AND AD_PrintFormatItem_Trl.AD_PrintFormatItem_ID=1 AND EXISTS (SELECT AD_PrintFormatItem_ID FROM AD_PrintFormatItem_trl \"old\" WHERE \"old\".AD_Language=AD_PrintFormatItem_Trl.AD_Language AND AD_PrintFormatItem_ID =2)";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
//[ 1707540 ] Dependency problem when modifying AD Columns and Sync.
//[ 1707611 ] Column synchronization for mandatory columns doesn't work //[ 1707540 ] Dependency problem when modifying AD Columns and Sync.
//[ 1707611 ] Column synchronization for mandatory columns doesn't work
public void testAlterColumn() {
sql = "ALTER TABLE Test MODIFY T_Integer NUMBER(10) NOT NULL"; sql = "ALTER TABLE Test MODIFY T_Integer NUMBER(10) NOT NULL";
//sqe = "ALTER TABLE Test ALTER COLUMN T_Integer TYPE NUMERIC(10); ALTER TABLE Test ALTER COLUMN T_Integer SET NOT NULL;"; //sqe = "ALTER TABLE Test ALTER COLUMN T_Integer TYPE NUMERIC(10); ALTER TABLE Test ALTER COLUMN T_Integer SET NOT NULL;";
sqe = "insert into t_alter_column values('test','T_Integer','NUMERIC(10)','NOT NULL',null)"; sqe = "insert into t_alter_column values('test','T_Integer','NUMERIC(10)','NOT NULL',null)";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
sql = "ALTER TABLE Test MODIFY T_Integer NUMBER(10) NULL"; sql = "ALTER TABLE Test MODIFY T_Integer NUMBER(10) NULL";
//sqe = "ALTER TABLE Test ALTER COLUMN T_Integer TYPE NUMERIC(10); ALTER TABLE Test ALTER COLUMN T_Integer DROP NOT NULL;"; //sqe = "ALTER TABLE Test ALTER COLUMN T_Integer TYPE NUMERIC(10); ALTER TABLE Test ALTER COLUMN T_Integer DROP NOT NULL;";
sqe = "insert into t_alter_column values('test','T_Integer','NUMERIC(10)','NULL',null)"; sqe = "insert into t_alter_column values('test','T_Integer','NUMERIC(10)','NULL',null)";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
sql = "ALTER TABLE Test MODIFY T_Integer NOT NULL"; sql = "ALTER TABLE Test MODIFY T_Integer NOT NULL";
sqe = "insert into t_alter_column values('test','T_Integer',null,'NOT NULL',null)"; sqe = "insert into t_alter_column values('test','T_Integer',null,'NOT NULL',null)";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
// Convert.recoverQuotedStrings() error on strings with "<-->" - teo_sarca [ 1705768 ] // Line 407 of ImportProduct.java
// http://sourceforge.net/tracker/index.php?func=detail&aid=1705768&group_id=176962&atid=879332 sql = "ALTER TABLE LPI_Publication MODIFY AD_Client_ID NUMERIC(10) DEFAULT NULL";
//sqe = "ALTER TABLE LPI_Publication ALTER COLUMN AD_Client_ID TYPE NUMERIC(10); ALTER TABLE LPI_Publication ALTER COLUMN AD_Client_ID SET DEFAULT NULL; ";
sqe = "insert into t_alter_column values('lpi_publication','AD_Client_ID','NUMERIC(10)',null,'NULL')";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
}
// Convert.recoverQuotedStrings() error on strings with "<-->" - teo_sarca [ 1705768 ]
// http://sourceforge.net/tracker/index.php?func=detail&aid=1705768&group_id=176962&atid=879332
public void test1705768() {
sql = "SELECT 'Partner <--> Organization', 's2\\$', 's3' FROM DUAL"; sql = "SELECT 'Partner <--> Organization', 's2\\$', 's3' FROM DUAL";
sqe = "SELECT 'Partner <--> Organization', E's2\\\\$', 's3'"; sqe = "SELECT 'Partner <--> Organization', E's2\\\\$', 's3'";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
public void test1704261() {
// [ 1704261 ] can not import currency rate // [ 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"; 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"; 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); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
public void testAlterTable() {
//[ 1668720 ] Convert failing in alter table //[ 1668720 ] Convert failing in alter table
sql = "ALTER TABLE GT_TaxBase ADD CONSTRAINT GT_TaxBase_Key PRIMARY KEY (GT_TaxBase_ID)"; 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)"; sqe = "ALTER TABLE GT_TaxBase ADD CONSTRAINT GT_TaxBase_Key PRIMARY KEY (GT_TaxBase_ID)";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
//[ 1668720 ] Convert failing in alter table //[ 1668720 ] Convert failing in alter table
sql = "ALTER TABLE GT_TaxBase ADD GT_TaxBase_ID NUMBER(10) NOT NULL"; sql = "ALTER TABLE GT_TaxBase ADD GT_TaxBase_ID NUMBER(10) NOT NULL";
sqe = "ALTER TABLE GT_TaxBase ADD COLUMN GT_TaxBase_ID NUMERIC(10) NOT NULL"; sqe = "ALTER TABLE GT_TaxBase ADD COLUMN GT_TaxBase_ID NUMERIC(10) NOT NULL";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
public void test1662983() {
//[ 1662983 ] Convert cutting backslash from string //[ 1662983 ] Convert cutting backslash from string
sql = "SELECT 'C:\\Documentos\\Test' FROM DUAL"; sql = "SELECT 'C:\\Documentos\\Test' FROM DUAL";
sqe = "SELECT E'C:\\\\Documentos\\\\Test'"; sqe = "SELECT E'C:\\\\Documentos\\\\Test'";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
sql = "SELECT 'C:Document' FROM DUAL"; sql = "SELECT 'C:Document' FROM DUAL";
sqe = "SELECT 'C:Document'"; sqe = "SELECT 'C:Document'";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
public void testMultiColumnAssignment() {
// Line 407 of ImportProduct.java // Line 407 of ImportProduct.java
sql = "ALTER TABLE LPI_Publication MODIFY AD_Client_ID NUMERIC(10) DEFAULT NULL";
//sqe = "ALTER TABLE LPI_Publication ALTER COLUMN AD_Client_ID TYPE NUMERIC(10); ALTER TABLE LPI_Publication ALTER COLUMN AD_Client_ID SET DEFAULT NULL; ";
sqe = "insert into t_alter_column values('lpi_publication','AD_Client_ID','NUMERIC(10)',null,'NULL')";
r = convert.convert(sql);
verify(sql, r, sqe);
// Line 407 of ImportProduct.java
sql = "UPDATE M_PRODUCT SET (Value,Name,Description,DocumentNote,Help,UPC,SKU,C_UOM_ID,M_Product_Category_ID,Classification,ProductType,Volume,Weight,ShelfWidth,ShelfHeight,ShelfDepth,UnitsPerPallet,Discontinued,DiscontinuedBy,Updated,UpdatedBy)= (SELECT Value,Name,Description,DocumentNote,Help,UPC,SKU,C_UOM_ID,M_Product_Category_ID,Classification,ProductType,Volume,Weight,ShelfWidth,ShelfHeight,ShelfDepth,UnitsPerPallet,Discontinued,DiscontinuedBy,SysDate,UpdatedBy FROM I_Product WHERE I_Product_ID=?) WHERE M_Product_ID=?"; sql = "UPDATE M_PRODUCT SET (Value,Name,Description,DocumentNote,Help,UPC,SKU,C_UOM_ID,M_Product_Category_ID,Classification,ProductType,Volume,Weight,ShelfWidth,ShelfHeight,ShelfDepth,UnitsPerPallet,Discontinued,DiscontinuedBy,Updated,UpdatedBy)= (SELECT Value,Name,Description,DocumentNote,Help,UPC,SKU,C_UOM_ID,M_Product_Category_ID,Classification,ProductType,Volume,Weight,ShelfWidth,ShelfHeight,ShelfDepth,UnitsPerPallet,Discontinued,DiscontinuedBy,SysDate,UpdatedBy FROM I_Product WHERE I_Product_ID=?) WHERE M_Product_ID=?";
sqe = "UPDATE M_PRODUCT SET Value=I_Product.Value,Name=I_Product.Name,Description=I_Product.Description,DocumentNote=I_Product.DocumentNote,Help=I_Product.Help,UPC=I_Product.UPC,SKU=I_Product.SKU,C_UOM_ID=I_Product.C_UOM_ID,M_Product_Category_ID=I_Product.M_Product_Category_ID,Classification=I_Product.Classification,ProductType=I_Product.ProductType,Volume=I_Product.Volume,Weight=I_Product.Weight,ShelfWidth=I_Product.ShelfWidth,ShelfHeight=I_Product.ShelfHeight,ShelfDepth=I_Product.ShelfDepth,UnitsPerPallet=I_Product.UnitsPerPallet,Discontinued=I_Product.Discontinued,DiscontinuedBy=I_Product.DiscontinuedBy,Updated=CURRENT_TIMESTAMP,UpdatedBy=I_Product.UpdatedBy FROM I_Product WHERE I_Product.I_Product_ID=? AND M_PRODUCT.M_Product_ID=?"; sqe = "UPDATE M_PRODUCT SET Value=I_Product.Value,Name=I_Product.Name,Description=I_Product.Description,DocumentNote=I_Product.DocumentNote,Help=I_Product.Help,UPC=I_Product.UPC,SKU=I_Product.SKU,C_UOM_ID=I_Product.C_UOM_ID,M_Product_Category_ID=I_Product.M_Product_Category_ID,Classification=I_Product.Classification,ProductType=I_Product.ProductType,Volume=I_Product.Volume,Weight=I_Product.Weight,ShelfWidth=I_Product.ShelfWidth,ShelfHeight=I_Product.ShelfHeight,ShelfDepth=I_Product.ShelfDepth,UnitsPerPallet=I_Product.UnitsPerPallet,Discontinued=I_Product.Discontinued,DiscontinuedBy=I_Product.DiscontinuedBy,Updated=CURRENT_TIMESTAMP,UpdatedBy=I_Product.UpdatedBy FROM I_Product WHERE I_Product.I_Product_ID=? AND M_PRODUCT.M_Product_ID=?";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
// test conversion of reserved words inside quotes //FinReport, test inner join in multi column update
sql = "UPDATE T_Report r SET (Name,Description)=("
+ "SELECT e.Name, fa.Description "
+ "FROM Fact_Acct fa"
+ " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)"
+ " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) "
+ "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID) "
+ "WHERE Fact_Acct_ID <> 0 AND AD_PInstance_ID=0";
sqe = "UPDATE T_Report SET Name=e.Name,Description=fa.Description FROM Fact_Acct fa INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID) INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) WHERE T_Report.Fact_Acct_ID=fa.Fact_Acct_ID AND T_Report.Fact_Acct_ID <> 0 AND T_Report.AD_PInstance_ID=0";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
//https://sourceforge.net/forum/message.php?msg_id=4083672
sql=" UPDATE AD_COLUMN c"
+" SET (ColumnName, Name, Description, Help) ="
+" (SELECT ColumnName, Name, Description, Help"
+" FROM AD_ELEMENT e WHERE c.AD_Element_ID=e.AD_Element_ID),"
+" Updated = SYSDATE"
+" WHERE EXISTS (SELECT 1 FROM AD_ELEMENT e "
+" WHERE c.AD_Element_ID=e.AD_Element_ID"
+" AND (c.ColumnName <> e.ColumnName OR c.Name <> e.Name "
+" OR NVL(c.Description,' ') <> NVL(e.Description,' ') OR NVL(c.Help,' ') <> NVL(e.Help,' ')))";
sqe = "UPDATE AD_COLUMN SET ColumnName=e.ColumnName,Name=e.Name,Description=e.Description,Help=e.Help, Updated = CURRENT_TIMESTAMP FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND EXISTS (SELECT 1 FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND (AD_COLUMN.ColumnName <> e.ColumnName OR AD_COLUMN.Name <> e.Name OR COALESCE(AD_COLUMN.Description,' ') <> COALESCE(e.Description,' ') OR COALESCE(AD_COLUMN.Help,' ') <> COALESCE(e.Help,' ')))";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
sql="UPDATE AD_WF_NODE n"
+" SET (Name, Description, Help) = (SELECT f.Name, f.Description, f.Help"
+" FROM AD_PROCESS f"
+" WHERE f.AD_Process_ID=n.AD_Process_ID)"
+" WHERE n.IsCentrallyMaintained = 'Y'"
+" AND EXISTS (SELECT 1 FROM AD_PROCESS f"
+" WHERE f.AD_Process_ID=n.AD_Process_ID"
+" AND (f.Name <> n.Name OR NVL(f.Description,' ') <> NVL(n.Description,' ') OR NVL(f.Help,' ') <> NVL(n.Help,' ')))";
sqe = "UPDATE AD_WF_NODE SET Name=f.Name,Description=f.Description,Help=f.Help FROM AD_PROCESS f WHERE f.AD_Process_ID=AD_WF_NODE.AD_Process_ID AND AD_WF_NODE.IsCentrallyMaintained = 'Y' AND EXISTS (SELECT 1 FROM AD_PROCESS f WHERE f.AD_Process_ID=AD_WF_NODE.AD_Process_ID AND (f.Name <> AD_WF_NODE.Name OR COALESCE(f.Description,' ') <> COALESCE(AD_WF_NODE.Description,' ') OR COALESCE(f.Help,' ') <> COALESCE(AD_WF_NODE.Help,' ')))";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
}
public void testReservedWordInQuote() {
// test conversion of reserved words inside quotes
sql = "UPDATE AD_Message_Trl SET MsgText='{0} Linea(s) {1,number,#,##0.00} - Total: {2,number,#,##0.00}',MsgTip=NULL,Updated=TO_DATE('2007-01-12 21:44:31','YYYY-MM-DD HH24:MI:SS'),IsTranslated='Y' WHERE AD_Message_ID=828 AND AD_Language='es_MX'"; sql = "UPDATE AD_Message_Trl SET MsgText='{0} Linea(s) {1,number,#,##0.00} - Total: {2,number,#,##0.00}',MsgTip=NULL,Updated=TO_DATE('2007-01-12 21:44:31','YYYY-MM-DD HH24:MI:SS'),IsTranslated='Y' WHERE AD_Message_ID=828 AND AD_Language='es_MX'";
sqe = "UPDATE AD_Message_Trl SET MsgText='{0} Linea(s) {1,number,#,##0.00} - Total: {2,number,#,##0.00}',MsgTip=NULL,Updated=TO_TIMESTAMP('2007-01-12 21:44:31','YYYY-MM-DD HH24:MI:SS'),IsTranslated='Y' WHERE AD_Message_ID=828 AND AD_Language='es_MX'"; sqe = "UPDATE AD_Message_Trl SET MsgText='{0} Linea(s) {1,number,#,##0.00} - Total: {2,number,#,##0.00}',MsgTip=NULL,Updated=TO_TIMESTAMP('2007-01-12 21:44:31','YYYY-MM-DD HH24:MI:SS'),IsTranslated='Y' WHERE AD_Message_ID=828 AND AD_Language='es_MX'";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
// uncomment to return without making the rest of tests
// if (true) return; public void test1580231() {
//financial report, bug [ 1580231 ] //financial report, bug [ 1580231 ]
sql = "UPDATE t_report" sql = "UPDATE t_report"
+ " SET (NAME, description) = (SELECT VALUE, NAME " + " SET (NAME, description) = (SELECT VALUE, NAME "
@ -134,24 +181,51 @@ public final class Convert_PostgreSQLTest {
+ " WHERE c_elementvalue_id = t_report.record_id) " + " WHERE c_elementvalue_id = t_report.record_id) "
+ " WHERE record_id <> 0 " + " AND ad_pinstance_id = 1000024 " + " WHERE record_id <> 0 " + " AND ad_pinstance_id = 1000024 "
+ " AND pa_reportline_id = 101 " + " AND fact_acct_id = 0 "; + " AND pa_reportline_id = 101 " + " AND fact_acct_id = 0 ";
sqe = "UPDATE t_report SET NAME=c_elementvalue.VALUE,description=c_elementvalue.NAME FROM c_elementvalue WHERE c_elementvalue.c_elementvalue_id = t_report.record_id AND t_report.record_id <> 0 AND t_report.ad_pinstance_id = 1000024 AND t_report.pa_reportline_id = 101 AND t_report.fact_acct_id = 0";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "UPDATE t_report SET NAME=c_elementvalue.VALUE,description=c_elementvalue.NAME FROM c_elementvalue WHERE c_elementvalue.c_elementvalue_id = t_report.record_id AND t_report.record_id <> 0 AND t_report.ad_pinstance_id = 1000024 AND t_report.pa_reportline_id = 101 AND t_report.fact_acct_id = 0"); assertEquals(sqe, r[0]);
}
//from victor's test
/*
public void testRowNum() {
//test limit //test limit
/*
sql = "UPDATE I_Order SET M_Warehouse_ID=(SELECT M_Warehouse_ID FROM M_Warehouse w WHERE ROWNUM=1 AND I_Order.AD_Client_ID=w.AD_Client_ID AND I_Order.AD_Org_ID=w.AD_Org_ID) WHERE M_Warehouse_ID IS NULL AND I_IsImported<>'Y' AND AD_Client_ID=11"; sql = "UPDATE I_Order SET M_Warehouse_ID=(SELECT M_Warehouse_ID FROM M_Warehouse w WHERE ROWNUM=1 AND I_Order.AD_Client_ID=w.AD_Client_ID AND I_Order.AD_Org_ID=w.AD_Org_ID) WHERE M_Warehouse_ID IS NULL AND I_IsImported<>'Y' AND AD_Client_ID=11";
sqe = "UPDATE I_Order SET M_Warehouse_ID=(SELECT M_Warehouse_ID FROM M_Warehouse w WHERE I_Order.AD_Client_ID=w.AD_Client_ID AND I_Order.AD_Org_ID=w.AD_Org_ID LIMIT 1 ) WHERE M_Warehouse_ID IS NULL AND I_IsImported<>'Y' AND AD_Client_ID=11" ;
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "UPDATE I_Order SET M_Warehouse_ID=(SELECT M_Warehouse_ID FROM M_Warehouse w WHERE I_Order.AD_Client_ID=w.AD_Client_ID AND I_Order.AD_Org_ID=w.AD_Org_ID LIMIT 1 ) WHERE M_Warehouse_ID IS NULL AND I_IsImported<>'Y' AND AD_Client_ID=11"); assertEquals(sqe, r[0]);
*/
//Doc_Invoice
sql = "UPDATE M_Product_PO po "
+ "SET PriceLastInv = "
+ "(SELECT currencyConvert(il.PriceActual,i.C_Currency_ID,po.C_Currency_ID,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID) "
+ "FROM C_Invoice i, C_InvoiceLine il "
+ "WHERE i.C_Invoice_ID=il.C_Invoice_ID"
+ " AND po.M_Product_ID=il.M_Product_ID AND po.C_BPartner_ID=i.C_BPartner_ID"
+ " AND ROWNUM=1 AND i.C_Invoice_ID=0) "
+ "WHERE EXISTS (SELECT * "
+ "FROM C_Invoice i, C_InvoiceLine il "
+ "WHERE i.C_Invoice_ID=il.C_Invoice_ID"
+ " AND po.M_Product_ID=il.M_Product_ID AND po.C_BPartner_ID=i.C_BPartner_ID"
+ " AND i.C_Invoice_ID=0)";
sqe = "UPDATE M_Product_PO SET PriceLastInv = (SELECT currencyConvert(il.PriceActual,i.C_Currency_ID,M_Product_PO.C_Currency_ID,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID) FROM C_Invoice i, C_InvoiceLine il WHERE i.C_Invoice_ID=il.C_Invoice_ID AND M_Product_PO.M_Product_ID=il.M_Product_ID AND M_Product_PO.C_BPartner_ID=i.C_BPartner_ID AND i.C_Invoice_ID=0 LIMIT 1 ) WHERE EXISTS (SELECT * FROM C_Invoice i, C_InvoiceLine il WHERE i.C_Invoice_ID=il.C_Invoice_ID AND M_Product_PO.M_Product_ID=il.M_Product_ID AND M_Product_PO.C_BPartner_ID=i.C_BPartner_ID AND i.C_Invoice_ID=0)";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
sql="UPDATE T_InventoryValue SET PricePO = (SELECT currencyConvert (po.PriceList,po.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, po.AD_Client_ID,po.AD_Org_ID) FROM M_Product_PO po WHERE po.M_Product_ID=T_InventoryValue.M_Product_ID AND po.IsCurrentVendor='Y' AND RowNum=1), PriceList = (SELECT currencyConvert(pp.PriceList,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceStd = (SELECT currencyConvert(pp.PriceStd,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceLimit = (SELECT currencyConvert(pp.PriceLimit,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID)";
sqe = "UPDATE T_InventoryValue SET PricePO = (SELECT currencyConvert (po.PriceList,po.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, po.AD_Client_ID,po.AD_Org_ID) FROM M_Product_PO po WHERE po.M_Product_ID=T_InventoryValue.M_Product_ID AND po.IsCurrentVendor='Y' LIMIT 1 ), PriceList = (SELECT currencyConvert(pp.PriceList,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceStd = (SELECT currencyConvert(pp.PriceStd,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceLimit = (SELECT currencyConvert(pp.PriceLimit,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID)";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
}*/
public void testAliasInUpdate() {
//test alias and column list update //test alias and column list update
sql = "UPDATE I_Order o SET (C_BPartner_ID,AD_User_ID)=(SELECT C_BPartner_ID,AD_User_ID FROM AD_User u WHERE o.ContactName=u.Name AND o.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL) WHERE C_BPartner_ID IS NULL AND ContactName IS NOT NULL AND EXISTS (SELECT Name FROM AD_User u WHERE o.ContactName=u.Name AND o.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL GROUP BY Name HAVING COUNT(*)=1) AND I_IsImported<>'Y' AND AD_Client_ID=11"; sql = "UPDATE I_Order o SET (C_BPartner_ID,AD_User_ID)=(SELECT C_BPartner_ID,AD_User_ID FROM AD_User u WHERE o.ContactName=u.Name AND o.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL) WHERE C_BPartner_ID IS NULL AND ContactName IS NOT NULL AND EXISTS (SELECT Name FROM AD_User u WHERE o.ContactName=u.Name AND o.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL GROUP BY Name HAVING COUNT(*)=1) AND I_IsImported<>'Y' AND AD_Client_ID=11";
sqe = "UPDATE I_Order SET C_BPartner_ID=u.C_BPartner_ID,AD_User_ID=u.AD_User_ID FROM AD_User u WHERE I_Order.ContactName=u.Name AND I_Order.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL AND I_Order.C_BPartner_ID IS NULL AND I_Order.ContactName IS NOT NULL AND EXISTS (SELECT Name FROM AD_User u WHERE I_Order.ContactName=u.Name AND I_Order.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL GROUP BY Name HAVING COUNT(*)=1) AND I_Order.I_IsImported<>'Y' AND I_Order.AD_Client_ID=11";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "UPDATE I_Order SET C_BPartner_ID=u.C_BPartner_ID,AD_User_ID=u.AD_User_ID FROM AD_User u WHERE I_Order.ContactName=u.Name AND I_Order.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL AND I_Order.C_BPartner_ID IS NULL AND I_Order.ContactName IS NOT NULL AND EXISTS (SELECT Name FROM AD_User u WHERE I_Order.ContactName=u.Name AND I_Order.AD_Client_ID=u.AD_Client_ID AND u.C_BPartner_ID IS NOT NULL GROUP BY Name HAVING COUNT(*)=1) AND I_Order.I_IsImported<>'Y' AND I_Order.AD_Client_ID=11"); assertEquals(sqe, r[0]);
}
public void test1580226() {
//from bug [ 1580226 ] - test alias and trunc //from bug [ 1580226 ] - test alias and trunc
sql = "INSERT INTO Fact_Acct_Balance ab " sql = "INSERT INTO Fact_Acct_Balance ab "
+ "(AD_Client_ID, AD_Org_ID, C_AcctSchema_ID, DateAcct," + "(AD_Client_ID, AD_Org_ID, C_AcctSchema_ID, DateAcct,"
@ -188,49 +262,18 @@ public final class Convert_PostgreSQLTest {
+ " C_Project_ID, AD_OrgTrx_ID, C_SalesRegion_ID, C_Activity_ID," + " C_Project_ID, AD_OrgTrx_ID, C_SalesRegion_ID, C_Activity_ID,"
+ " C_Campaign_ID, C_LocTo_ID, C_LocFrom_ID, User1_ID, User2_ID, GL_Budget_ID"; + " C_Campaign_ID, C_LocTo_ID, C_LocFrom_ID, User1_ID, User2_ID, GL_Budget_ID";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, sqe); assertEquals(sqe, r[0]);
}
//Doc_Invoice
/* public void testTrunc() {
sql = "UPDATE M_Product_PO po "
+ "SET PriceLastInv = "
+ "(SELECT currencyConvert(il.PriceActual,i.C_Currency_ID,po.C_Currency_ID,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID) "
+ "FROM C_Invoice i, C_InvoiceLine il "
+ "WHERE i.C_Invoice_ID=il.C_Invoice_ID"
+ " AND po.M_Product_ID=il.M_Product_ID AND po.C_BPartner_ID=i.C_BPartner_ID"
+ " AND ROWNUM=1 AND i.C_Invoice_ID=0) "
+ "WHERE EXISTS (SELECT * "
+ "FROM C_Invoice i, C_InvoiceLine il "
+ "WHERE i.C_Invoice_ID=il.C_Invoice_ID"
+ " AND po.M_Product_ID=il.M_Product_ID AND po.C_BPartner_ID=i.C_BPartner_ID"
+ " AND i.C_Invoice_ID=0)";
r = convert.convert(sql);
verify(sql,r,"UPDATE M_Product_PO SET PriceLastInv = (SELECT currencyConvert(il.PriceActual,i.C_Currency_ID,M_Product_PO.C_Currency_ID,i.DateInvoiced,i.C_ConversionType_ID,i.AD_Client_ID,i.AD_Org_ID) FROM C_Invoice i, C_InvoiceLine il WHERE i.C_Invoice_ID=il.C_Invoice_ID AND M_Product_PO.M_Product_ID=il.M_Product_ID AND M_Product_PO.C_BPartner_ID=i.C_BPartner_ID AND i.C_Invoice_ID=0 LIMIT 1 ) WHERE EXISTS (SELECT * FROM C_Invoice i, C_InvoiceLine il WHERE i.C_Invoice_ID=il.C_Invoice_ID AND M_Product_PO.M_Product_ID=il.M_Product_ID AND M_Product_PO.C_BPartner_ID=i.C_BPartner_ID AND i.C_Invoice_ID=0)");
*/
//From bug [ 1576358 ] and [ 1577055 ] //From bug [ 1576358 ] and [ 1577055 ]
sql = "SELECT TRUNC(TO_DATE('2006-10-13','YYYY-MM-DD'),'Q') FROM DUAL"; sql = "SELECT TRUNC(TO_DATE('2006-10-13','YYYY-MM-DD'),'Q') FROM DUAL";
sqe = "SELECT TRUNC(TO_TIMESTAMP('2006-10-13','YYYY-MM-DD'),'Q')";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "SELECT TRUNC(TO_TIMESTAMP('2006-10-13','YYYY-MM-DD'),'Q')"); assertEquals(sqe, r[0]);
}
//FinReport, test inner join in subquery
sql = "UPDATE T_Report r SET (Name,Description)=(" public void testSubQuery() {
+ "SELECT e.Name, fa.Description "
+ "FROM Fact_Acct fa"
+ " INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID)"
+ " INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) "
+ "WHERE r.Fact_Acct_ID=fa.Fact_Acct_ID) "
+ "WHERE Fact_Acct_ID <> 0 AND AD_PInstance_ID=0";
r = convert.convert(sql);
verify(sql, r, "UPDATE T_Report SET Name=e.Name,Description=fa.Description FROM Fact_Acct fa INNER JOIN AD_Table t ON (fa.AD_Table_ID=t.AD_Table_ID) INNER JOIN AD_Element e ON (t.TableName||'_ID'=e.ColumnName) WHERE T_Report.Fact_Acct_ID=fa.Fact_Acct_ID AND T_Report.Fact_Acct_ID <> 0 AND T_Report.AD_PInstance_ID=0");
//MInOutLineMa bug [ 1622302 ]
sql = "DELETE FROM M_InOutLineMA ma WHERE EXISTS "
+ "(SELECT * FROM M_InOutLine l WHERE l.M_InOutLine_ID=ma.M_InOutLine_ID"
+ " AND M_InOut_ID=0)";
r = convert.convert(sql);
verify(sql, r, "DELETE FROM M_InOutLineMA WHERE EXISTS (SELECT * FROM M_InOutLine l WHERE l.M_InOutLine_ID=M_InOutLineMA.M_InOutLine_ID AND M_InOut_ID=0)");
//MLanguage.addTable //MLanguage.addTable
sql = "INSERT INTO " + "AD_Column_Trl" sql = "INSERT INTO " + "AD_Column_Trl"
+ "(AD_Language,IsTranslated, AD_Client_ID,AD_Org_ID, " + "(AD_Language,IsTranslated, AD_Client_ID,AD_Org_ID, "
@ -243,39 +286,22 @@ public final class Convert_PostgreSQLTest {
+ " WHERE " + "AD_Column_ID" + " NOT IN (SELECT " + "AD_Column_ID" + " WHERE " + "AD_Column_ID" + " NOT IN (SELECT " + "AD_Column_ID"
+ " FROM " + "AD_Column_Trl" + " FROM " + "AD_Column_Trl"
+ " WHERE AD_Language='" + "es_MX" + "')"; + " WHERE AD_Language='" + "es_MX" + "')";
sqe = "INSERT INTO AD_Column_Trl(AD_Language,IsTranslated, AD_Client_ID,AD_Org_ID, Createdby,UpdatedBy, AD_Column_ID,Name) SELECT 'es_MX','N', AD_Client_ID,AD_Org_ID, 100,100, AD_Column_ID,Name FROM AD_Column WHERE AD_Column_ID NOT IN (SELECT AD_Column_ID FROM AD_Column_Trl WHERE AD_Language='es_MX')";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "INSERT INTO AD_Column_Trl(AD_Language,IsTranslated, AD_Client_ID,AD_Org_ID, Createdby,UpdatedBy, AD_Column_ID,Name) SELECT 'es_MX','N', AD_Client_ID,AD_Org_ID, 100,100, AD_Column_ID,Name FROM AD_Column WHERE AD_Column_ID NOT IN (SELECT AD_Column_ID FROM AD_Column_Trl WHERE AD_Language='es_MX')"); assertEquals(sqe, r[0]);
}
//https://sourceforge.net/forum/message.php?msg_id=4083672
sql=" UPDATE AD_COLUMN c" public void test1622302() {
+" SET (ColumnName, Name, Description, Help) =" //MInOutLineMa bug [ 1622302 ]
+" (SELECT ColumnName, Name, Description, Help" sql = "DELETE FROM M_InOutLineMA ma WHERE EXISTS "
+" FROM AD_ELEMENT e WHERE c.AD_Element_ID=e.AD_Element_ID)," + "(SELECT * FROM M_InOutLine l WHERE l.M_InOutLine_ID=ma.M_InOutLine_ID"
+" Updated = SYSDATE" + " AND M_InOut_ID=0)";
+" WHERE EXISTS (SELECT 1 FROM AD_ELEMENT e " sqe = "DELETE FROM M_InOutLineMA WHERE EXISTS (SELECT * FROM M_InOutLine l WHERE l.M_InOutLine_ID=M_InOutLineMA.M_InOutLine_ID AND M_InOut_ID=0)";
+" WHERE c.AD_Element_ID=e.AD_Element_ID"
+" AND (c.ColumnName <> e.ColumnName OR c.Name <> e.Name "
+" OR NVL(c.Description,' ') <> NVL(e.Description,' ') OR NVL(c.Help,' ') <> NVL(e.Help,' ')))";
r = convert.convert(sql); r = convert.convert(sql);
verify(sql, r, "UPDATE AD_COLUMN SET ColumnName=e.ColumnName,Name=e.Name,Description=e.Description,Help=e.Help, Updated = CURRENT_TIMESTAMP FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND EXISTS (SELECT 1 FROM AD_ELEMENT e WHERE AD_COLUMN.AD_Element_ID=e.AD_Element_ID AND (AD_COLUMN.ColumnName <> e.ColumnName OR AD_COLUMN.Name <> e.Name OR COALESCE(AD_COLUMN.Description,' ') <> COALESCE(e.Description,' ') OR COALESCE(AD_COLUMN.Help,' ') <> COALESCE(e.Help,' ')))"); assertEquals(sqe, r[0]);
}
sql="UPDATE AD_WF_NODE n"
+" SET (Name, Description, Help) = (SELECT f.Name, f.Description, f.Help" public void test1638046() {
+" FROM AD_PROCESS f"
+" WHERE f.AD_Process_ID=n.AD_Process_ID)"
+" WHERE n.IsCentrallyMaintained = 'Y'"
+" AND EXISTS (SELECT 1 FROM AD_PROCESS f"
+" WHERE f.AD_Process_ID=n.AD_Process_ID"
+" AND (f.Name <> n.Name OR NVL(f.Description,' ') <> NVL(n.Description,' ') OR NVL(f.Help,' ') <> NVL(n.Help,' ')))";
r = convert.convert(sql);
verify(sql, r, "UPDATE AD_WF_NODE SET Name=f.Name,Description=f.Description,Help=f.Help FROM AD_PROCESS f WHERE f.AD_Process_ID=AD_WF_NODE.AD_Process_ID AND AD_WF_NODE.IsCentrallyMaintained = 'Y' AND EXISTS (SELECT 1 FROM AD_PROCESS f WHERE f.AD_Process_ID=AD_WF_NODE.AD_Process_ID AND (f.Name <> AD_WF_NODE.Name OR COALESCE(f.Description,' ') <> COALESCE(AD_WF_NODE.Description,' ') OR COALESCE(f.Help,' ') <> COALESCE(AD_WF_NODE.Help,' ')))");
/*
sql="UPDATE T_InventoryValue SET PricePO = (SELECT currencyConvert (po.PriceList,po.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, po.AD_Client_ID,po.AD_Org_ID) FROM M_Product_PO po WHERE po.M_Product_ID=T_InventoryValue.M_Product_ID AND po.IsCurrentVendor='Y' AND RowNum=1), PriceList = (SELECT currencyConvert(pp.PriceList,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceStd = (SELECT currencyConvert(pp.PriceStd,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceLimit = (SELECT currencyConvert(pp.PriceLimit,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID)";
r = convert.convert(sql);
verify(sql, r, "UPDATE T_InventoryValue SET PricePO = (SELECT currencyConvert (po.PriceList,po.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, po.AD_Client_ID,po.AD_Org_ID) FROM M_Product_PO po WHERE po.M_Product_ID=T_InventoryValue.M_Product_ID AND po.IsCurrentVendor='Y' LIMIT 1 ), PriceList = (SELECT currencyConvert(pp.PriceList,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceStd = (SELECT currencyConvert(pp.PriceStd,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID), PriceLimit = (SELECT currencyConvert(pp.PriceLimit,pl.C_Currency_ID,T_InventoryValue.C_Currency_ID,T_InventoryValue.DateValue,null, pl.AD_Client_ID,pl.AD_Org_ID) FROM M_PriceList pl, M_PriceList_Version plv, M_ProductPrice pp WHERE pp.M_Product_ID=T_InventoryValue.M_Product_ID AND pp.M_PriceList_Version_ID=T_InventoryValue.M_PriceList_Version_ID AND pp.M_PriceList_Version_ID=plv.M_PriceList_Version_ID AND plv.M_PriceList_ID=pl.M_PriceList_ID)");
*/
//bug [ 1638046 ] //bug [ 1638046 ]
sql = "UPDATE GL_JournalBatch jb" sql = "UPDATE GL_JournalBatch jb"
+ " SET (TotalDr, TotalCr) = (SELECT COALESCE(SUM(TotalDr),0), COALESCE(SUM(TotalCr),0)" + " SET (TotalDr, TotalCr) = (SELECT COALESCE(SUM(TotalDr),0), COALESCE(SUM(TotalCr),0)"
@ -289,29 +315,26 @@ public final class Convert_PostgreSQLTest {
+ "TotalCr=( SELECT COALESCE(SUM(TotalCr),0) FROM GL_Journal j " + "TotalCr=( SELECT COALESCE(SUM(TotalCr),0) FROM GL_Journal j "
+ "WHERE j.IsActive='Y' AND GL_JournalBatch.GL_JournalBatch_ID=j.GL_JournalBatch_ID ) " + "WHERE j.IsActive='Y' AND GL_JournalBatch.GL_JournalBatch_ID=j.GL_JournalBatch_ID ) "
+ " WHERE GL_JournalBatch_ID=0"; + " WHERE GL_JournalBatch_ID=0";
verify(sql, r, sqe); assertEquals(sqe, r[0]);
} }
private void verify(String original, String[] converted, String expected) { //[ 1727193 ] Convert failed with decode in quoted string
if (converted == null || converted.length != 1) { public void test1727193() {
System.out.println("Convert test failed for: "); sql = "update a set a.ten_decode = 'b'";
System.out.println(original); sqe = "update a set a.ten_decode = 'b'";
System.out.println("Reason: Null or empty result."); r = convert.convert(sql);
} else if (!(converted[0].equals(expected))) { assertEquals(sqe, r[0]);
System.out.println("Convert test failed for: ");
System.out.println(original); sql = "update a set a.b = 'ten_decode'";
System.out.println("Result: "); sqe = "update a set a.b = 'ten_decode'";
System.out.println(converted[0]); r = convert.convert(sql);
System.out.println("Expected: "); assertEquals(sqe, r[0]);
System.out.println(expected);
System.out.println("Reason: Actual result does not match with expected result.");
} else {
System.out.println("Pass.");
}
} }
public static void main(String[] args) { public void testDecode() {
new Convert_PostgreSQLTest().doTest(); sql = "SELECT supplier_name, decode(supplier_id, 10000, 'IBM', 10001, 'Microsoft', 10002, 'Hewlett Packard', 'Gateway') FROM suppliers";
sqe = "SELECT supplier_name, CASE WHEN supplier_id=10000 THEN 'IBM' WHEN supplier_id=10001 THEN 'Microsoft' WHEN supplier_id=10002 THEN 'Hewlett Packard' ELSE 'Gateway' END FROM suppliers";
r = convert.convert(sql);
assertEquals(sqe, r[0]);
} }
} }

21
base/src/org/compiere/dbPort/Convert_SQL92.java
View File

@ -330,17 +330,32 @@ public abstract class Convert_SQL92 extends Convert {
* @param sqlStatement * @param sqlStatement
* @return converted statement * @return converted statement
*/ */
protected String convertDecode(String sqlStatement) protected String convertDecode(String sqlStatement, int fromIndex)
{ {
// log.info("DECODE<== " + sqlStatement); // log.info("DECODE<== " + sqlStatement);
String statement = sqlStatement; String statement = sqlStatement;
StringBuffer sb = new StringBuffer("CASE"); StringBuffer sb = new StringBuffer("CASE");
int index = statement.indexOf("DECODE"); int index = statement.toUpperCase().indexOf("DECODE", fromIndex);
if (index <= 0) return sqlStatement;
if (Character.isWhitespace(statement.charAt(index - 1)) == false)
return sqlStatement;
String firstPart = statement.substring(0,index); String firstPart = statement.substring(0,index);
// find the opening ( // find the opening (
index = statement.indexOf('(', index); index = index + 6;
while (index < statement.length()) {
char c = statement.charAt(index);
if (Character.isWhitespace(c)) {
index++;
continue;
}
if (c == '(') break;
return sqlStatement;
}
statement = statement.substring(index+1); statement = statement.substring(index+1);
// find the expression "a" - find first , ignoring () // find the expression "a" - find first , ignoring ()