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

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

Author: roy
Date: 2008-08-19 12:59:06 +0200 (Tue, 19 Aug 2008)
New Revision: 286

Modified:
   src/main/java/nl/improved/sqlclient/commands/InfoCommand.java
Log:
add information when no connection is opened


Modified: src/main/java/nl/improved/sqlclient/commands/InfoCommand.java
===================================================================
--- src/main/java/nl/improved/sqlclient/commands/InfoCommand.java	2008-08-19 08:01:34 UTC (rev 285)
+++ src/main/java/nl/improved/sqlclient/commands/InfoCommand.java	2008-08-19 10:59:06 UTC (rev 286)
@@ -35,9 +35,15 @@
      */
     @Override
     public CharSequence execute(SQLCommand cmd) {
-        java.sql.Connection conn = DBConnector.getInstance().getConnection();
-        StringBuilder returnValue = new StringBuilder();
+        java.sql.Connection conn;
         try {
+            conn = DBConnector.getInstance().getConnection();
+        } catch(IllegalStateException e) {
+            return "This command shows information about the current connection.\nCurrently SQLShell is not connected to a database server.\n"+
+                    "Please use the connect command to create a connection";
+        }
+        StringBuffer returnValue = new StringBuffer();
+        try {
             DatabaseMetaData metaData = conn.getMetaData();
             returnValue.append("URL       : "+ metaData.getURL()+"\n");
             returnValue.append("User      : "+ metaData.getUserName()+"\n");