fix(jdbc): DatabaseMetaData#getColumns should also retrieve columns f…

…rom SYSTEM TABLE types
xerial · Jan 26, 2023 · 473f528 · 473f528
1 parent e68bc05
commit 473f528
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java b/src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
@@ -937,8 +937,7 @@ public ResultSet getColumns(String c, String s, String tblNamePattern, String co
         ResultSet rs = null;
         try {
             // Get all tables implied by the input
-            final String[] types = new String[] {"TABLE", "VIEW"};
-            rs = getTables(c, s, tblNamePattern, types);
+            rs = getTables(c, s, tblNamePattern, null);
             while (rs.next()) {
                 String tableName = rs.getString(3);
 

diff --git a/src/test/java/org/sqlite/DBMetaDataTest.java b/src/test/java/org/sqlite/DBMetaDataTest.java
@@ -373,6 +373,18 @@ public void getColumns() throws SQLException {
         assertThat(rs.next()).isFalse();
 
         rs = meta.getColumns(null, null, "%", "%");
+        // SYSTEM TABLE "sqlite_schema"
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("TABLE_NAME")).isEqualTo("sqlite_schema");
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("type");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("name");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("tbl_name");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("rootpage");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("sql");
         // TABLE "test"
         assertThat(rs.next()).isTrue();
         assertThat(rs.getString("TABLE_NAME")).isEqualTo("test");
@@ -402,6 +414,20 @@ public void getColumns() throws SQLException {
         rs = meta.getColumns(null, null, "doesnotexist", "%");
         assertThat(rs.next()).isFalse();
         assertThat(rs.getMetaData().getColumnCount()).isEqualTo(24);
+
+        rs = meta.getColumns(null, null, "sqlite_schema", "%");
+        // SYSTEM TABLE "sqlite_schema"
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("TABLE_NAME")).isEqualTo("sqlite_schema");
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("type");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("name");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("tbl_name");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("rootpage");
+        assertThat(rs.next()).isTrue();
+        assertThat(rs.getString("COLUMN_NAME")).isEqualTo("sql");
     }
 
     @Test