github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1249] Add breakpoint capability to jOOQ Console - parameter

Browse Source 
description in breakpoint hit display.
This commit is contained in:
Chrriis 2012-05-12 13:13:42 +02:00
parent a8cffce340
commit a8d2092a10
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ-console/src/main/java/org/jooq/debug/BreakpointHit.java
View File

@ -53,14 +53,16 @@ public class BreakpointHit implements Serializable {
private boolean isBeforeExecution;
private Integer breakpointID;
private String sql;
private String parameterDescription;
private long threadID;
private String threadName;
private StackTraceElement[] callerStackTraceElements;
public BreakpointHit(int breakpointID, String sql, long threadID, String threadName, StackTraceElement[] callerStackTraceElements, boolean isBeforeExecution) {
public BreakpointHit(int breakpointID, String sql, String parameterDescription, long threadID, String threadName, StackTraceElement[] callerStackTraceElements, boolean isBeforeExecution) {
this.isBeforeExecution = isBeforeExecution;
this.breakpointID = breakpointID;
this.sql = sql;
this.parameterDescription = parameterDescription;
this.threadID = threadID;
this.threadName = threadName;
this.callerStackTraceElements = callerStackTraceElements;
@ -81,6 +83,10 @@ public class BreakpointHit implements Serializable {
return sql;
}
public String getParameterDescription() {
return parameterDescription;
}
public long getThreadID() {
return threadID;
}

16
jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java
View File

@ -115,6 +115,7 @@ public class DebugListener extends DefaultExecuteListener {
private long startExecutionTime;
private long endExecutionTime;
private String matchingSQL;
private String matchingParameterDescription;
private String effectiveSQL;
private Breakpoint matchingBreakpoint;
private Debugger matchingDebugger = null;
@ -129,12 +130,13 @@ public class DebugListener extends DefaultExecuteListener {
Breakpoint[] breakpoints = debugger.getBreakpoints();
if(breakpoints != null) {
for(Breakpoint breakpoint: breakpoints) {
String sql_ = null;
String parameterDescription = null;
if(statementInfo == null) {
String[] sql = ctx.batchSQL();
SqlQueryType sqlQueryType = SqlQueryType.detectType(sql[0]);
String parameterDescription = null;
if(sql.length == 1) {
matchingSQL = sql[0];
sql_ = sql[0];
PreparedStatement statement = ctx.statement();
if(statement instanceof UsageTrackingPreparedStatement) {
parameterDescription = ((UsageTrackingPreparedStatement) statement).getParameterDescription();
@ -147,11 +149,13 @@ public class DebugListener extends DefaultExecuteListener {
}
sb.append(sql[i]);
}
matchingSQL = sb.toString();
sql_ = sb.toString();
}
statementInfo = new StatementInfo(sqlQueryType, sql, parameterDescription);
}
if(breakpoint.matches(statementInfo, true)) {
matchingSQL = sql_;
matchingParameterDescription = parameterDescription;
matchingDebugger = debugger;
matchingBreakpoint = breakpoint;
if(breakpoint.isBreaking()) {
@ -194,6 +198,7 @@ public class DebugListener extends DefaultExecuteListener {
StatementProcessor replacementExecutionProcessor = matchingBreakpoint.getReplacementExecutionProcessor();
if(replacementExecutionProcessor != null) {
mainSQL = replacementExecutionProcessor.processSQL(matchingSQL);
matchingParameterDescription = null;
try {
ctx.statement().close();
ctx.sql(mainSQL);
@ -212,7 +217,7 @@ public class DebugListener extends DefaultExecuteListener {
String threadName = currentThread.getName();
StackTraceElement[] callerStackTraceElements = currentThread.getStackTrace();
callerStackTraceElements = Arrays.copyOfRange(callerStackTraceElements, 2, callerStackTraceElements.length);
BreakpointHit breakpointHit = new BreakpointHit(matchingBreakpoint.getID(), effectiveSQL, threadID, threadName, callerStackTraceElements, true);
BreakpointHit breakpointHit = new BreakpointHit(matchingBreakpoint.getID(), effectiveSQL, matchingParameterDescription, threadID, threadName, callerStackTraceElements, true);
matchingDebugger.processBreakpointBeforeExecutionHit(ctx, breakpointHit);
// Breakpoint has an answer.
if(breakpointHit.getBreakpointID() == null) {
@ -220,6 +225,7 @@ public class DebugListener extends DefaultExecuteListener {
String sql = breakpointHit.getSql();
if(sql != null) {
effectiveSQL = sql;
matchingParameterDescription = null;
try {
ctx.statement().close();
ctx.sql(effectiveSQL);
@ -345,7 +351,7 @@ public class DebugListener extends DefaultExecuteListener {
String threadName = currentThread.getName();
StackTraceElement[] callerStackTraceElements = currentThread.getStackTrace();
callerStackTraceElements = Arrays.copyOfRange(callerStackTraceElements, 2, callerStackTraceElements.length);
matchingDebugger.processBreakpointAfterExecutionHit(ctx, new BreakpointHit(matchingBreakpoint.getID(), effectiveSQL, threadID, threadName, callerStackTraceElements, false));
matchingDebugger.processBreakpointAfterExecutionHit(ctx, new BreakpointHit(matchingBreakpoint.getID(), effectiveSQL, matchingParameterDescription, threadID, threadName, callerStackTraceElements, false));
}
if(matchingBreakpoint != null) {
StatementProcessor afterExecutionProcessor = matchingBreakpoint.getAfterExecutionProcessor();

7
jOOQ-console/src/main/java/org/jooq/debug/console/BreakpointHitEditor.java
View File

@ -88,7 +88,12 @@ public class BreakpointHitEditor extends JPanel {
int y = 0;
breakpointHitExecutionPane.add(new JLabel("Statement:"), new GridBagConstraints(0, y++, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
SqlTextArea sqlTextArea = new SqlTextArea();
sqlTextArea.setText(breakpointHit.getSql() + "\n");
String sql = breakpointHit.getSql();
String parameterDescription = breakpointHit.getParameterDescription();
if(parameterDescription != null) {
sql += "\n -> " + parameterDescription;
}
sqlTextArea.setText(sql + "\n");
sqlTextArea.setCaretPosition(0);
breakpointHitExecutionPane.add(new RTextScrollPane(sqlTextArea), new GridBagConstraints(0, y++, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
if(breakpointHit.isBeforeExecution()) {