[CUBRIDQA-1240] Added the showTrace option to SystemModel to refrain …

…from converting numeric values to '?' for show trace when set to true
CUBRID · Nov 27, 2024 · 565006c · 565006c
1 parent 781832f
commit 565006c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/CTP/sql/configuration/System.xml b/CTP/sql/configuration/System.xml
@@ -2,5 +2,6 @@
 <useMonitor>false</useMonitor>
 <jdbcPath>/data/home/bu1/CUBRID/jdbc/cubrid_jdbc.jar</jdbcPath>
 <queryPlan>false</queryPlan>
+<showTrace>false</showTrace>
 <errorMessage>false</errorMessage>
 </system>
diff --git a/CTP/sql/src/com/navercorp/cubridqa/cqt/console/bean/SystemModel.java b/CTP/sql/src/com/navercorp/cubridqa/cqt/console/bean/SystemModel.java
@@ -45,6 +45,8 @@ public class SystemModel {
 
     private boolean queryPlan;
 
+    private boolean showTrace;
+
     private boolean cpResultToRemoteHost;
 
     private boolean errorMessage;
@@ -119,6 +121,14 @@ public void setQueryPlan(boolean queryPlan) {
         this.queryPlan = queryPlan;
     }
 
+    public boolean isShowTrace() {
+        return showTrace;
+    }
+
+    public void setShowTrace(boolean showTrace) {
+        this.showTrace = showTrace;
+    }
+
     public String getRemoteHost() {
         return remoteHost;
     }

diff --git a/CTP/sql/src/com/navercorp/cubridqa/cqt/console/dao/ConsoleDAO.java b/CTP/sql/src/com/navercorp/cubridqa/cqt/console/dao/ConsoleDAO.java
@@ -900,11 +900,18 @@ private void getResult(ResultSet rs, Sql sql) {
             } catch (Exception e) {
             }
         }
-
+        SystemModel systemModel =
+                (SystemModel)
+                        XstreamHelper.fromXml(
+                                EnvGetter.getenv("CTP_HOME")
+                                        + File.separator
+                                        + "sql/configuration/System.xml");
         String script = sql.getScript().trim().toUpperCase();
         if (script.startsWith("SHOW TRACE")) {
             String res = ret.toString();
-            res = res.replaceAll("[0-9]+", "?");
+            if (!systemModel.isShowTrace()) {
+                res = res.replaceAll("[0-9]+", "?");
+            }
             sql.setResult(sql.getResult() + res + System.getProperty("line.separator"));
         } else {
             sql.setResult(sql.getResult() + ret.toString() + System.getProperty("line.separator"));