diff --git a/dbPort/src/org/compiere/db/AdempiereDatabase.java b/dbPort/src/org/compiere/db/AdempiereDatabase.java index 13d2de2187..6ac13b30e0 100644 --- a/dbPort/src/org/compiere/db/AdempiereDatabase.java +++ b/dbPort/src/org/compiere/db/AdempiereDatabase.java @@ -275,7 +275,6 @@ public interface AdempiereDatabase */ // public String getDataType (int displayType, int precision, // boolean defaultValue) - public boolean getSupportAlias(); } // AdempiereDatabase diff --git a/dbPort/src/org/compiere/db/DB_DB2.java b/dbPort/src/org/compiere/db/DB_DB2.java index c6c0bf4b1b..9c5a1fc4f5 100644 --- a/dbPort/src/org/compiere/db/DB_DB2.java +++ b/dbPort/src/org/compiere/db/DB_DB2.java @@ -837,10 +837,5 @@ public class DB_DB2 public Convert getConvert() { throw new UnsupportedOperationException("Not implemented."); } - - public boolean getSupportAlias() - { - return false; - } - + } // DB_DB2 diff --git a/dbPort/src/org/compiere/db/DB_Fyracle.java b/dbPort/src/org/compiere/db/DB_Fyracle.java index 76f1e6463c..193129bfef 100644 --- a/dbPort/src/org/compiere/db/DB_Fyracle.java +++ b/dbPort/src/org/compiere/db/DB_Fyracle.java @@ -549,13 +549,7 @@ public class DB_Fyracle implements AdempiereDatabase { public boolean isSupported(String sql) { return true; - } - - - public boolean getSupportAlias() - { - return false; - } + } } // DB_Firebird diff --git a/dbPort/src/org/compiere/db/DB_Oracle.java b/dbPort/src/org/compiere/db/DB_Oracle.java index 1001abc1e4..bd22d0e814 100644 --- a/dbPort/src/org/compiere/db/DB_Oracle.java +++ b/dbPort/src/org/compiere/db/DB_Oracle.java @@ -1117,9 +1117,5 @@ public class DB_Oracle implements AdempiereDatabase, OracleConnectionCacheCallba return m_convert; } - public boolean getSupportAlias() - { - return false; - } } // DB_Oracle diff --git a/dbPort/src/org/compiere/db/DB_PostgreSQL.java b/dbPort/src/org/compiere/db/DB_PostgreSQL.java index 9742a5afdc..464b6df262 100755 --- a/dbPort/src/org/compiere/db/DB_PostgreSQL.java +++ b/dbPort/src/org/compiere/db/DB_PostgreSQL.java @@ -667,6 +667,7 @@ public class DB_PostgreSQL implements AdempiereDatabase } } // main + /* public boolean getSupportAlias() { @@ -679,6 +680,6 @@ public class DB_PostgreSQL implements AdempiereDatabase } return false; - } + }*/ } // DB_PostgreSQL diff --git a/dbPort/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java index 8f6f2ff759..42362903b9 100644 --- a/dbPort/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java +++ b/dbPort/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java @@ -29,7 +29,7 @@ public final class ConvertMap_PostgreSQL { s_pg.put("\\bVARCHAR2\\b", "VARCHAR"); s_pg.put("\\bNVARCHAR2\\b", "VARCHAR"); s_pg.put("\\bNCHAR\\b", "CHAR"); - //begin vpj-cd e-evolution 03/11/2005 PostgreSQL + //begin vpj-cd e-evolution 03/11/2005 PostgreSQL s_pg.put("\\bBLOB\\b", "BYTEA"); // BLOB not directly supported s_pg.put("\\bCLOB\\b", "BYTEA"); // CLOB not directly supported s_pg.put("\\bLIMIT\\b","\"limit\""); @@ -38,7 +38,7 @@ public final class ConvertMap_PostgreSQL { s_pg.put("\\bnew\\b","\"new\""); //s_pg.put("\\bBLOB\\b", "OID"); // BLOB not directly supported //s_pg.put("\\bCLOB\\b", "OID"); // CLOB not directly supported - //end vpj-cd e-evolution 03/11/2005 PostgreSQL + //end vpj-cd e-evolution 03/11/2005 PostgreSQL // Storage s_pg.put("\\bCACHE\\b", ""); diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java index ca209be891..42bd31b1a0 100644 --- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java +++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java @@ -91,22 +91,22 @@ public class Convert_PostgreSQL extends Convert_SQL92 { result.add(convertDDL(converSimpleStatement(statement))); } else if (cmpString.indexOf("ROWNUM") != -1) { result - .add(convertRowNum(convertAlias(converSimpleStatement(statement)))); + .add(convertRowNum(converSimpleStatement(statement))); } else if (cmpString.indexOf("DELETE ") != -1 && cmpString.indexOf("DELETE FROM") == -1) { statement = convertDelete(statement); cmpString = statement; // System.out.println("-------------cmpString:"+cmpString); - result.add(converSimpleStatement(convertAlias(cmpString))); + result.add(converSimpleStatement(cmpString)); } else if (cmpString.indexOf("DELETE FROM") != -1) { - result.add(converSimpleStatement(convertAlias(statement))); + result.add(converSimpleStatement(statement)); } else if (cmpString.indexOf("UPDATE ") != -1) { result - .add(converSimpleStatement(convertUpdate(convertAlias(statement)))); + .add(converSimpleStatement(convertUpdate(statement))); } else { - result.add(converSimpleStatement(convertAlias(statement))); + result.add(converSimpleStatement(statement)); } // else // result.add(converSimpleStatement(statement)); @@ -1489,6 +1489,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 { return sqlStatement; } // convertDelete + // begin vpj-cd e-evolution 08/02/2005 /*************************************************************************** * convertAlias - for compatibility with 8.1 @@ -1496,12 +1497,9 @@ public class Convert_PostgreSQL extends Convert_SQL92 { * @param sqlStatement * @return converted statementf */ - private String convertAlias(String sqlStatement) { - - - if (!org.compiere.util.DB.getDatabase().getSupportAlias()) - return sqlStatement; - + /** we Victor, Carlos , Heng sin, Kontro are agree to only support PostgreSQL 8.2 + * this methos now i comment until finish test with PostgreSQL 8.2 + private String convertAlias(String sqlStatement) { String[] tokens = sqlStatement.split("\\s"); String table = null; String alias = null; @@ -1549,7 +1547,8 @@ public class Convert_PostgreSQL extends Convert_SQL92 { } else { return sqlStatement; } - } // convertDelete + } // + */ // end vpj-cd e-evolution 02/24/2005 PostgreSQL