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

Remove Support to minor Version that PostgreSQL 8.2, we concentrated only in stabilizing ADEmpiere for PostgreSQL 8.2

This commit is contained in:
vpj-cd 2007-01-11 19:09:42 +00:00
parent 8062e26a3b
commit 58e734ce65
7 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbPort/src/org/compiere/db/AdempiereDatabase.java
View File

@ -275,7 +275,6 @@ public interface AdempiereDatabase
*/
// public String getDataType (int displayType, int precision,
// boolean defaultValue)
public boolean getSupportAlias();
} // AdempiereDatabase

7
dbPort/src/org/compiere/db/DB_DB2.java
View File

@ -837,10 +837,5 @@ public class DB_DB2
public Convert getConvert() {
throw new UnsupportedOperationException("Not implemented.");
}
public boolean getSupportAlias()
{
return false;
}
} // DB_DB2

8
dbPort/src/org/compiere/db/DB_Fyracle.java
View File

@ -549,13 +549,7 @@ public class DB_Fyracle implements AdempiereDatabase {
public boolean isSupported(String sql) {
return true;
}
public boolean getSupportAlias()
{
return false;
}
}
} // DB_Firebird

4
dbPort/src/org/compiere/db/DB_Oracle.java
View File

@ -1117,9 +1117,5 @@ public class DB_Oracle implements AdempiereDatabase, OracleConnectionCacheCallba
return m_convert;
}
public boolean getSupportAlias()
{
return false;
}
} // DB_Oracle

3
dbPort/src/org/compiere/db/DB_PostgreSQL.java
View File

@ -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

4
dbPort/src/org/compiere/dbPort/ConvertMap_PostgreSQL.java
View File

@ -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", "");

23
dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
View File

@ -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