mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-05-20 02:55:00 -05:00
Code Issues Packages Projects Releases 105 Wiki Activity

added ability to execute SQL fragments

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jailer/code/trunk@1476 3dd849cd-670e-4645-a7cd-dd197c8d0e81
This commit is contained in:
rwisser
2017-11-24 08:23:06 +00:00
parent 41c400da3d
commit 244cf476ae
7 changed files with 115 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
releasenotes.txt
+3
View File
@@ -1,3 +1,6 @@
7.5.8
- SQLConsole: added ability to execute SQL fragments.
7.5.7
- Minor GUI improvements.
src/main/engine/net/sf/jailer/JailerVersion.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class JailerVersion {
/**
* The Jailer version.
*/
public static final String VERSION = "7.5.7";
public static final String VERSION = "7.5.8";
/**
* The Jailer working tables version.
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/SQLConsole.java
+51 -12
View File
@@ -340,8 +340,9 @@ public abstract class SQLConsole extends javax.swing.JPanel {
* @param sqlBlock the sql block
* @param location location of the block in the console
* @param emptyLineSeparatesStatements
* @param locFragmentOffset location of statement fragment, if any
*/
protected void executeSQLBlock(final String sqlBlock, final Pair<Integer, Integer> location, final boolean emptyLineSeparatesStatements) {
protected void executeSQLBlock(final String sqlBlock, final Pair<Integer, Integer> location, final boolean emptyLineSeparatesStatements, final Pair<Integer, Integer> locFragmentOffset) {
if (!running.get()) {
int lineStartOffset = -1;
try {
@@ -380,17 +381,33 @@ public abstract class SQLConsole extends javax.swing.JPanel {
Matcher matcher = pattern.matcher(sqlBlock);
boolean result = matcher.find();
StringBuffer sb = new StringBuffer();
if (result) {
if (result || locFragmentOffset != null) {
do {
sb.setLength(0);
matcher.appendReplacement(sb, "");
String pureSql = sb.toString();
sb.append(matcher.group());
String sql = sb.toString();
String sql;
String pureSql;
if (locFragmentOffset != null) {
sql = sqlBlock;
pureSql = sqlBlock;
} else {
sb.setLength(0);
matcher.appendReplacement(sb, "");
pureSql = sb.toString();
sb.append(matcher.group());
sql = sb.toString();
}
status.linesExecuting += countLines(pureSql);
if (sql.trim().length() > 0) {
executeSQL(pureSql, status, lineStartOffset);
if (status.failed) {
if (locFragmentOffset != null) {
status.sqlFragment = sql;
if (status.errorPositionIsKnown) {
try {
status.errorPosition += locFragmentOffset.a - editorPane.getLineStartOffset(editorPane.getLineOfOffset(locFragmentOffset.a));
} catch (BadLocationException e) {
}
}
}
break;
}
}
@@ -398,6 +415,9 @@ public abstract class SQLConsole extends javax.swing.JPanel {
lineStartOffset += sql.length();
}
status.linesExecuted += countLines(sql) - 1;
if (locFragmentOffset != null) {
break;
}
String terminator = matcher.group(1);
if (terminator != null && !terminator.contains("\n")) { // ';' without nl
status.linesExecuted++;
@@ -406,7 +426,7 @@ public abstract class SQLConsole extends javax.swing.JPanel {
result = matcher.find();
} while (result);
}
if (!status.failed) {
if (!status.failed && locFragmentOffset == null) {
sb.setLength(0);
matcher.appendTail(sb);
String sbToString = sb.toString();
@@ -645,6 +665,7 @@ public abstract class SQLConsole extends javax.swing.JPanel {
boolean hasUpdated = false;
long timeInMS;
Throwable error;
String sqlFragment;
Pair<Integer, Integer> location;
private synchronized void updateView(boolean force) {
@@ -687,7 +708,9 @@ public abstract class SQLConsole extends javax.swing.JPanel {
if (errorLine >= 0) {
editorPane.setLineTrackingIcon(errorLine, scaledCancelIcon);
}
statusTextPane.setText(pos + error.getMessage());
statusTextPane.setText(pos + error.getMessage()
+ (sqlFragment == null? "" :
"\nSQL: \"" + (sqlFragment.trim()) + "\""));
} else {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@@ -1188,16 +1211,32 @@ public abstract class SQLConsole extends javax.swing.JPanel {
}
private void executeSelectedStatements() {
Pair<Integer, Integer> loc = editorPane.getCurrentStatementLocation(null);
String sql;
Pair<Integer, Integer> loc = null;
Pair<Integer, Integer> locFragmentOffset = null;
Pair<Pair<Integer, Integer>, Pair<Integer, Integer>> locFragment = editorPane.getCurrentStatementFragmentLocation();
if (locFragment != null) {
loc = locFragment.a;
locFragmentOffset = locFragment.b;
try {
sql = editorPane.getDocument().getText(locFragmentOffset.a, locFragmentOffset.b - locFragmentOffset.a);
} catch (BadLocationException e) {
e.printStackTrace();
return;
}
} else {
loc = editorPane.getCurrentStatementLocation(null);
sql = editorPane.getText(loc.a, loc.b, true);
}
if (loc != null) {
executeSQLBlock(editorPane.getText(loc.a, loc.b, true), loc, editorPane.getCaret().getDot() == editorPane.getCaret().getMark());
executeSQLBlock(sql, loc, true, locFragmentOffset);
}
}
private void executeAllStatements() {
if (editorPane.getLineCount() > 0) {
Pair<Integer, Integer> loc = new Pair<Integer, Integer>(0, editorPane.getLineCount() - 1);
executeSQLBlock(editorPane.getText(loc.a, loc.b, true), loc, false);
executeSQLBlock(editorPane.getText(loc.a, loc.b, true), loc, true, null);
}
}
src/main/gui/net/sf/jailer/ui/resource/sqlconsolebegin.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 406 B

src/main/gui/net/sf/jailer/ui/resource/sqlconsolebeginend.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 417 B

src/main/gui/net/sf/jailer/ui/resource/sqlconsoleend.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 384 B

src/main/gui/net/sf/jailer/ui/syntaxtextarea/RSyntaxTextAreaWithSQLSyntaxStyle.java
+60 -9
View File
@@ -103,6 +103,10 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
iconBegin = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsolebegin.png")));
iconBeginEnd = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsolebeginend.png")));
iconEnd = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsoleend.png")));
iconf = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsolef.png")));
iconBeginf = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsolebeginf.png")));
iconBeginEndf = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsolebeginendf.png")));
iconEndf = scaleToLineHeight(new ImageIcon(MetaDataPanel.class.getResource(dir + "/sqlconsoleendf.png")));
} catch (Exception e) {
e.printStackTrace();
}
@@ -276,7 +280,7 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
}
/**
* Gets statement(s) at caret position.
* Replaces statement(s) at caret position.
*
* @param replacement
* the replacement
@@ -359,6 +363,34 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
return true;
}
/**
* Gets start- and end-line number of statement fragment at caret position, if any.
*
* @return pair of (start and end line number) and (begin- end-offset)
*/
public Pair<Pair<Integer, Integer>, Pair<Integer, Integer>> getCurrentStatementFragmentLocation() {
int begin = Math.min(getCaret().getDot(), getCaret().getMark());
int end = Math.max(getCaret().getDot(), getCaret().getMark());
if (begin == end || end - begin > 1000000) {
return null;
}
Segment txt = new Segment();
try {
getDocument().getText(begin, end - begin, txt);
Pattern pattern = Pattern.compile("(\\n\\s*\\n)|(;\\s*(\\n\\r?|$))", Pattern.DOTALL);
Matcher matcher = pattern.matcher(txt);
if (!matcher.find()) {
return new Pair<Pair<Integer, Integer>, Pair<Integer, Integer>>(
new Pair<Integer, Integer>(getLineOfOffset(begin), getLineOfOffset(end)),
new Pair<Integer, Integer>(begin, end)
);
}
} catch (BadLocationException e) {
return null;
}
return null;
}
/**
* Gets start- and end-line number of statement(s) at caret position.
*
@@ -571,7 +603,15 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
public void updateMenuItemState(boolean allowRun, boolean setLineHighlights) {
Set<Integer> eosLines = new HashSet<Integer>();
Pair<Integer, Integer> loc = getCurrentStatementLocation(eosLines);
Pair<Integer, Integer> loc;
Pair<Integer, Integer> locFragmentOffset = null;
Pair<Pair<Integer, Integer>, Pair<Integer, Integer>> locFragment = getCurrentStatementFragmentLocation();
if (locFragment != null) {
loc = locFragment.a;
locFragmentOffset = locFragment.b;
} else {
loc = getCurrentStatementLocation(eosLines);
}
runBlock.setEnabled(allowRun && loc != null && !isTextEmpty(loc.a, loc.b));
runAll.setEnabled(allowRun && RSyntaxTextAreaWithSQLSyntaxStyle.this.getDocument().getLength() > 0);
if (allowRun && setLineHighlights) {
@@ -593,19 +633,26 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
} else {
theIcon = icon;
}
if (locFragmentOffset != null) {
if (theIcon == icon) {
theIcon = iconf;
}
if (theIcon == iconBegin) {
theIcon = iconBeginf;
}
if (theIcon == iconBeginEnd) {
theIcon = iconBeginEndf;
}
if (theIcon == iconEnd) {
theIcon = iconEndf;
}
}
gutter.addLineTrackingIcon(l, theIcon);
}
}
} catch (BadLocationException e) {
}
}
// for (int l = loc.a; l <= loc.b; ++l) {
// try {
// addLineHighlight(l, new Color(235, 255, 245));
// } catch (BadLocationException e) {
// e.printStackTrace();
// }
// }
if (loc.b - loc.a > 10000) {
stopped.set(false);
pending.set(true);
@@ -683,5 +730,9 @@ public class RSyntaxTextAreaWithSQLSyntaxStyle extends RSyntaxTextArea implement
private ImageIcon iconBegin;
private ImageIcon iconBeginEnd;
private ImageIcon iconEnd;
private ImageIcon iconf;
private ImageIcon iconBeginf;
private ImageIcon iconBeginEndf;
private ImageIcon iconEndf;
}