sqlshell

Author: roy
Date: 2010-05-08 11:49:05 +0200 (Sat, 08 May 2010)
New Revision: 472

Modified:
   README
Log:
more stuff


Modified: README
===================================================================
--- README	2010-05-08 09:48:51 UTC (rev 471)
+++ README	2010-05-08 09:49:05 UTC (rev 472)
@@ -1,5 +1,8 @@
 INTENTION
-The intention of writing this sqlclient/sqlshell is to provide a common interface to different databases we use in our company. But most important is that the interface to a commercial client we use is really not very usefull. Our goal is to add as many features as we can think of to this small utility class so that our daily work is made a lot easier. The initial functionality should contain:
+The intention of writing this sqlclient/sqlshell is to provide a common interface to different databases we use
+in our company. But most important is that the interface to a commercial client we use is really
+not very usefull. Our goal is to add as many features as we can think of to this small utility class
+so that our daily work is made a lot easier. The initial functionality should contain:
 - sql command history (key up/down)
 - tab completion (at least for select queries)
 - execute a sql file (@mystatements.sql)
@@ -20,7 +23,7 @@
 
 With Charva
 In order to run sqlshell using charva you need to have the charva libraries in the lib folder.
-Currently charva is compiled for windows (32 bits) and linux intel 32 bits and amd 64 bits. If you don't
+Currently charva is compiled for windows (32 bits) and linux intel 32 and 64 bits and amd 64 bits. If you don't
 own an intel 32 bits, you need to modify the contents of the lib/charva directory.
 
 With JCurses

Author: roy
Date: 2010-05-08 12:15:34 +0200 (Sat, 08 May 2010)
New Revision: 474

Modified:
   src/main/java/nl/improved/sqlclient/commands/DescCommand.java
Log:
some code cleanup


Modified: src/main/java/nl/improved/sqlclient/commands/DescCommand.java
===================================================================
--- src/main/java/nl/improved/sqlclient/commands/DescCommand.java	2010-05-08 09:50:38 UTC (rev 473)
+++ src/main/java/nl/improved/sqlclient/commands/DescCommand.java	2010-05-08 10:15:34 UTC (rev 474)
@@ -15,6 +15,7 @@
  */
 package nl.improved.sqlclient.commands;
 
+import java.sql.Connection;
 import nl.improved.sqlclient.SQLCommand;
 import java.util.List;
 import java.util.ArrayList;
@@ -31,12 +32,16 @@
  * Command to describe table properties.
  */
 public class DescCommand implements Command {
+
+    public static ResultSet getColumnMetaData(Connection conn, String tableName) throws SQLException {
+        return conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%");
+    }
     /**
      * Execute the describe command.
      */
     @Override
     public CommandResult execute(SQLCommand command) {
-        java.sql.Connection conn = DBConnector.getInstance().getConnection();
+        Connection conn = DBConnector.getInstance().getConnection();
         String cmd = command.getCommandString();
         if (cmd.endsWith(";")) {
             cmd = cmd.substring(0, cmd.length()-1);
@@ -50,7 +55,8 @@
         boolean foundMatch = false;
         ResultSet rs = null;
         try {
-            rs = conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%");
+            //rs = conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%");
+            rs = getColumnMetaData(conn, tableName);
             int row = 0;
             while (rs.next()) {
                 foundMatch = true;

Author: roy
Date: 2010-05-08 11:48:51 +0200 (Sat, 08 May 2010)
New Revision: 471

Modified:
   src/test/java/nl/improved/sqlclient/SQLUtilTest.java
Log:
more test


Modified: src/test/java/nl/improved/sqlclient/SQLUtilTest.java
===================================================================
--- src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2010-05-07 08:17:22 UTC (rev 470)
+++ src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2010-05-08 09:48:51 UTC (rev 471)
@@ -554,6 +554,23 @@
         assertTrue("Table name should match 'mytable', but was " + matches.get(0), matches.contains("mytable"));
     }
 
+    public void testGetLastBreak() {
+        String input =    "abc def gh ijk";
+        String expected = "abc def gh";
+        int index = SQLUtil.getLastBreakIndex(input);
+        assertEquals(expected, input.substring(0, index));
+
+        input =    "abc.def gh.ijk";
+        expected = "abc.def gh";
+        index = SQLUtil.getLastBreakIndex(input);
+        assertEquals(expected, input.substring(0, index));
+
+        input =    "abc(def gh(ijk";
+        expected = "abc(def gh";
+        index = SQLUtil.getLastBreakIndex(input);
+        assertEquals(expected, input.substring(0, index));
+    }
+
 /*    public void testTabCompletionInfoDESC() {
         List<String> sqlCommand = Arrays.asList(new String[]{"DESC "});
         Point cursorPos = new Point(sqlCommand.get(0).length(),0);

Author: roy
Date: 2010-05-07 10:17:22 +0200 (Fri, 07 May 2010)
New Revision: 470

Modified:
   src/main/java/nl/improved/sqlclient/QueryExecutor.java
Log:
fixes for postgres
don't leave connection in an unusable state when a statement failed.
call rollback on savepoint


Modified: src/main/java/nl/improved/sqlclient/QueryExecutor.java
===================================================================
--- src/main/java/nl/improved/sqlclient/QueryExecutor.java	2010-03-08 20:34:54 UTC (rev 469)
+++ src/main/java/nl/improved/sqlclient/QueryExecutor.java	2010-05-07 08:17:22 UTC (rev 470)
@@ -15,10 +15,12 @@
  */
 package nl.improved.sqlclient;
 
+import java.sql.Connection;
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.Savepoint;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
@@ -163,23 +165,37 @@
      * @return the formatted result.
      * @throws SQLException if the database could not execute the SQL query for some reason.
      */
+    private static int savePointCounter = 0;
     public Iterator<CharSequence> executeQuery(CharSequence command) throws SQLException {
         cancelled = false;
         long start = System.currentTimeMillis();
-        ResultSet results = DBConnector.getInstance().getStatement().executeQuery(command.toString());
+        Connection con = DBConnector.getInstance().getConnection();
+        Savepoint savePoint = null;
+        if (!con.getAutoCommit()) {
+            String savePointName = "SavePoint"+(++savePointCounter);
+            savePoint = con.setSavepoint(savePointName);
+        }
+        try {
+            ResultSet results = DBConnector.getInstance().getStatement().executeQuery(command.toString());
 
-        //StringBuffer separator = new StringBuffer();
-        //StringBuffer displayValue = new StringBuffer();
+            //StringBuffer separator = new StringBuffer();
+            //StringBuffer displayValue = new StringBuffer();
 
-        ResultSetMetaData metadata = results.getMetaData();
+            ResultSetMetaData metadata = results.getMetaData();
 
-        // TODO specify labels
-        List<String> labels = new ArrayList<String>();
-        for ( int col = 1; col <= metadata.getColumnCount(); col++) {
-            labels.add(metadata.getColumnLabel(col));
+            // TODO specify labels
+            List<String> labels = new ArrayList<String>();
+            for ( int col = 1; col <= metadata.getColumnCount(); col++) {
+                labels.add(metadata.getColumnLabel(col));
+            }
+
+            return new QueryExecutorIterator(start, results, labels, metadata);
+        } catch(SQLException e) {
+            if (savePoint != null) {
+                try {con.rollback(savePoint);} catch(SQLException ex) {}
+            }
+            throw e;
         }
-
-        return new QueryExecutorIterator(start, results, labels, metadata);
     }
 
     private class QueryExecutorIterator implements Iterator<CharSequence> {