X-Git-Url: http://jaekl.net/gitweb/?p=squelch.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fjaekl%2Fsquelch%2Fstmt%2FDescribe.java;h=e75b364a839a8ecc69451924b649d2965289081d;hp=a76e5f04efb1bf68f9ff16a001a210f222a15d68;hb=14b727ac09bf5a635b49a50864be3904f6c03d89;hpb=bb9b1774cd6b96464b5c602458ad622ff17fd6cb diff --git a/src/main/java/net/jaekl/squelch/stmt/Describe.java b/src/main/java/net/jaekl/squelch/stmt/Describe.java index a76e5f0..e75b364 100644 --- a/src/main/java/net/jaekl/squelch/stmt/Describe.java +++ b/src/main/java/net/jaekl/squelch/stmt/Describe.java @@ -56,27 +56,27 @@ public class Describe extends Stmt { tablePattern = driver.adjustCase(tablePattern); if (tablePattern.length() < 1) { - return describeAll(pw, metaData); + return describeAll(driver, pw, metaData); } else { - return describeTable(pw, metaData, tablePattern); + return describeTable(driver, pw, metaData, tablePattern); } } - int describeAll(PrintWriter pw, DatabaseMetaData metaData) + int describeAll(DbDriver driver, PrintWriter pw, DatabaseMetaData metaData) throws SQLException { try (ResultSet rs = metaData.getTables(null, null, "%", null)) { TabularResultSet tabular = new TabularResultSet(rs); // TODO: StringTable i18n - tabular.printTable(pw, "???"); + tabular.printTable(driver, pw, "???"); } return 0; } - int describeTable(PrintWriter pw, DatabaseMetaData metaData, String tablePattern) + int describeTable(DbDriver driver, PrintWriter pw, DatabaseMetaData metaData, String tablePattern) throws SQLException { boolean found = false; @@ -86,7 +86,7 @@ public class Describe extends Stmt { { while (rs.next()) { found = true; - describe(pw, metaData, rs); + describe(driver, pw, metaData, rs); } } @@ -97,7 +97,7 @@ public class Describe extends Stmt { return 0; } - void describe(PrintWriter pw, DatabaseMetaData metaData, ResultSet tableRs) + void describe(DbDriver driver, PrintWriter pw, DatabaseMetaData metaData, ResultSet tableRs) throws SQLException { String catalogueName = tableRs.getString(1); @@ -123,7 +123,7 @@ public class Describe extends Stmt { { TabularColumnInfo tabular = new TabularColumnInfo(colsRs); // TODO: StringTable i18n - tabular.printTable(pw, "???"); + tabular.printTable(driver, pw, "???"); } } }