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

IDEMPIERE-4454 Implement filter for SQL debug - unify oracle and postgresql variable (#252)

This commit is contained in:
Carlos Ruiz 2020-09-17 15:02:22 +02:00 committed by GitHub
parent 6771a696cc
commit d3c9804253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
View File

@ -371,8 +371,13 @@ public class DB_Oracle implements AdempiereDatabase
public String convertStatement (String oraStatement) public String convertStatement (String oraStatement)
{ {
Convert.logMigrationScript(oraStatement, null); Convert.logMigrationScript(oraStatement, null);
if ("true".equals(System.getProperty("org.idempiere.db.oracle.debug"))) { if ("true".equals(System.getProperty("org.idempiere.db.debug"))) {
log.warning("Oracle -> " + oraStatement); String filterOrDebug = System.getProperty("org.idempiere.db.debug.filter");
boolean print = true;
if (filterOrDebug != null)
print = oraStatement.matches(filterOrDebug);
if (print)
log.warning("Oracle -> " + oraStatement);
} }
return oraStatement; return oraStatement;
} // convertStatement } // convertStatement

9
org.compiere.db.oracle.provider/src/org/compiere/dbPort/Convert_Oracle.java
View File

@ -15,8 +15,13 @@ public class Convert_Oracle extends Convert {
protected ArrayList<String> convertStatement(String sqlStatement) { protected ArrayList<String> convertStatement(String sqlStatement) {
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();
result.add(sqlStatement); result.add(sqlStatement);
if ("true".equals(System.getProperty("org.idempiere.db.oracle.debug"))) { if ("true".equals(System.getProperty("org.idempiere.db.debug"))) {
log.warning("Oracle -> " + sqlStatement); String filterOrDebug = System.getProperty("org.idempiere.db.debug.filter");
boolean print = true;
if (filterOrDebug != null)
print = sqlStatement.matches(filterOrDebug);
if (print)
log.warning("Oracle -> " + sqlStatement);
} }
return result; return result;
} }

9
org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
View File

@ -355,9 +355,14 @@ public class DB_PostgreSQL implements AdempiereDatabase
String cache = convertCache.get(oraStatement); String cache = convertCache.get(oraStatement);
if (cache != null) { if (cache != null) {
Convert.logMigrationScript(oraStatement, cache); Convert.logMigrationScript(oraStatement, cache);
if ("true".equals(System.getProperty("org.idempiere.db.postgresql.debug"))) { if ("true".equals(System.getProperty("org.idempiere.db.debug"))) {
String filterPgDebug = System.getProperty("org.idempiere.db.debug.filter");
boolean print = true;
if (filterPgDebug != null)
print = cache.matches(filterPgDebug);
// log.warning("Oracle -> " + oraStatement); // log.warning("Oracle -> " + oraStatement);
log.warning("Pgsql -> " + cache); if (print)
log.warning("Pgsql -> " + cache);
} }
return cache; return cache;
} }

13
org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java
View File

@ -127,9 +127,16 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
statement = recoverQuotedStrings(statement, retVars); statement = recoverQuotedStrings(statement, retVars);
result.add(statement); result.add(statement);
if ("true".equals(System.getProperty("org.idempiere.db.postgresql.debug"))) { if ("true".equals(System.getProperty("org.idempiere.db.debug"))) {
log.warning("Oracle -> " + sqlStatement); String filterPgDebug = System.getProperty("org.idempiere.db.debug.filter");
log.warning("PgSQL -> " + statement); boolean print = true;
if (filterPgDebug != null)
print = statement.matches(filterPgDebug);
// log.warning("Oracle -> " + oraStatement);
if (print) {
log.warning("Oracle -> " + sqlStatement);
log.warning("PgSQL -> " + statement);
}
} }
return result; return result;
} // convertStatement } // convertStatement