From f82c6a9468a0cd4e5bddf141105429e174ae52f8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 26 Apr 2024 14:47:32 +0200 Subject: [PATCH] IDEMPIERE-6128 make org.idempiere.db.debug show just native Postgresql by default (#2335) --- .../src/org/compiere/model/SystemProperties.java | 9 +++++++++ .../src/org/compiere/dbPort/Convert_PostgreSQL.java | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/SystemProperties.java b/org.adempiere.base/src/org/compiere/model/SystemProperties.java index db44544c79..0f77fc12f6 100644 --- a/org.adempiere.base/src/org/compiere/model/SystemProperties.java +++ b/org.adempiere.base/src/org/compiere/model/SystemProperties.java @@ -47,6 +47,7 @@ public class SystemProperties { private static final String org_adempiere_po_useTimeoutForUpdate = "org.adempiere.po.useTimeoutForUpdate"; private static final String org_compiere_report_path = "org.compiere.report.path"; private static final String org_idempiere_db_debug = "org.idempiere.db.debug"; + private static final String org_idempiere_db_debug_convert = "org.idempiere.db.debug.convert"; private static final String org_idempiere_db_debug_filter = "org.idempiere.db.debug.filter"; private static final String org_idempiere_FileLogPrefix = "org.idempiere.FileLogPrefix"; private static final String org_idempiere_postgresql_URLParameters = "org.idempiere.postgresql.URLParameters"; @@ -178,6 +179,14 @@ public class SystemProperties { return System.getProperty(org_idempiere_db_debug_filter); } + /** + * org.idempiere.db.convert=true to print also Oracle SQL Statements being converted + * @return + */ + public static boolean isDBDebugConvert() { + return "true".equals(System.getProperty(org_idempiere_db_debug_convert)); + } + /** * org.idempiere.FileLogPrefix defines the template prefix to write logs * @return diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java index d40ff07f88..9d05187b3a 100644 --- a/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/compiere/dbPort/Convert_PostgreSQL.java @@ -148,9 +148,9 @@ public class Convert_PostgreSQL extends Convert_SQL92 { boolean print = true; if (filterPgDebug != null) print = statement.matches(filterPgDebug); - // log.warning("Oracle -> " + oraStatement); if (print) { - log.warning("Oracle -> " + sqlStatement); + if (SystemProperties.isDBDebugConvert()) + log.warning("Oracle -> " + sqlStatement); log.warning("PgSQL -> " + statement); } }