From: SVN by r. <sv...@ca...> - 2009-09-30 17:50:25
|
Author: roy Date: 2009-09-30 19:50:15 +0200 (Wed, 30 Sep 2009) New Revision: 425 Modified: src/main/java/nl/improved/sqlclient/commands/DescCommand.java Log: fixes in separators Modified: src/main/java/nl/improved/sqlclient/commands/DescCommand.java =================================================================== --- src/main/java/nl/improved/sqlclient/commands/DescCommand.java 2009-09-26 13:39:06 UTC (rev 424) +++ src/main/java/nl/improved/sqlclient/commands/DescCommand.java 2009-09-30 17:50:15 UTC (rev 425) @@ -43,8 +43,10 @@ } String tableName = DBConnector.getInstance().translateDbVar(cmd.substring(cmd.lastIndexOf(' ')).trim()); ResultBuilder result = new ResultBuilder(); - result.setHorizontalSeparatorEnabled(false); - result.setVerticalSeparator(' '); + boolean oldEnabled = ResultBuilder.getHorizontalSeparatorEnabled(); + char oldChar = ResultBuilder.getVerticalSeparator(); + ResultBuilder.setHorizontalSeparatorEnabled(false); + ResultBuilder.setVerticalSeparator(' '); boolean foundMatch = false; try { ResultSet rs = conn.getMetaData().getColumns(conn.getCatalog(), DBConnector.getInstance().getSchema(), tableName, "%"); @@ -67,7 +69,7 @@ if (!foundMatch) { rs = conn.getMetaData() .getTables(conn.getCatalog(), DBConnector.getInstance().getSchema() - , tableName, new String[]{"TABLE"}); + , tableName, null); if (!rs.next()) { return new SimpleCommandResult(false, "Failed to find table '"+tableName+"'"); } @@ -92,10 +94,13 @@ } result.setFooter(footer); } + return new SimpleCommandResult(true, result.toString()); } catch (SQLException ex) { throw new IllegalStateException("Failed to find columnnames for table: "+ tableName, ex); + } finally { + ResultBuilder.setHorizontalSeparatorEnabled(oldEnabled); + ResultBuilder.setVerticalSeparator(oldChar); } - return new SimpleCommandResult(true, result.toString()); } /** |