Skip to content

Commit 891b650

Browse files
authored
fix(jdbc): ResultSetMetaData.getCatalogName incorrectly returns the table name
Closes: xerial#1279
1 parent 1a0662b commit 891b650

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/main/java/org/sqlite/jdbc3/JDBC3ResultSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public ResultSetMetaData getMetaData() {
573573

574574
/** @see java.sql.ResultSetMetaData#getCatalogName(int) */
575575
public String getCatalogName(int col) throws SQLException {
576-
return safeGetColumnTableName(col);
576+
return "";
577577
}
578578

579579
/** @see java.sql.ResultSetMetaData#getColumnClassName(int) */

src/test/java/org/sqlite/RSMetaDataTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ public void close() throws SQLException {
4343

4444
@Test
4545
public void catalogName() throws SQLException {
46-
assertThat(meta.getCatalogName(1)).isEqualTo("People");
46+
assertThat(meta.getCatalogName(1)).isEqualTo("");
47+
}
48+
49+
@Test
50+
public void schemaName() throws SQLException {
51+
assertThat(meta.getSchemaName(1)).isEqualTo("");
4752
}
4853

4954
@Test
@@ -196,8 +201,8 @@ public void nullable() throws SQLException {
196201
}
197202

198203
@Test
199-
public void badCatalogIndex() {
200-
assertThatExceptionOfType(SQLException.class).isThrownBy(() -> meta.getCatalogName(4));
204+
public void badTableIndex() {
205+
assertThatExceptionOfType(SQLException.class).isThrownBy(() -> meta.getTableName(5));
201206
}
202207

203208
@Test

0 commit comments

Comments
 (0)