[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient/commands

[SVN by r. <sv...@ca...>]

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;