Skip to content

Commit

Permalink
fix(jdbc): DatabaseMetaData#getColumns now returns SCOPE_CATALOG colu…
Browse files Browse the repository at this point in the history
…mn instead of SCOPE_CATLOG

Closes: #837
  • Loading branch information
gotson committed Feb 6, 2023
1 parent 8466e9a commit 4429515
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/sqlite/jdbc3/JDBC3DatabaseMetaData.java
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ public ResultSet getColumns(String c, String s, String tblNamePattern, String co
"0 as SQL_DATA_TYPE, 0 as SQL_DATETIME_SUB, 2000000000 as CHAR_OCTET_LENGTH, ")
.append(
"ordpos as ORDINAL_POSITION, (case colnullable when 0 then 'NO' when 1 then 'YES' else '' end)")
.append(" as IS_NULLABLE, null as SCOPE_CATLOG, null as SCOPE_SCHEMA, ")
.append(" as IS_NULLABLE, null as SCOPE_CATALOG, null as SCOPE_SCHEMA, ")
.append("null as SCOPE_TABLE, null as SOURCE_DATA_TYPE, ")
.append(
"(case colautoincrement when 0 then 'NO' when 1 then 'YES' else '' end) as IS_AUTOINCREMENT, ")
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/org/sqlite/DBMetaDataTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1063,8 +1063,7 @@ public void columnOrderOfgetColumns() throws SQLException {
assertThat(rsmeta.getColumnName(16)).isEqualTo("CHAR_OCTET_LENGTH");
assertThat(rsmeta.getColumnName(17)).isEqualTo("ORDINAL_POSITION");
assertThat(rsmeta.getColumnName(18)).isEqualTo("IS_NULLABLE");
// should be SCOPE_CATALOG, but misspelt in the standard
assertThat(rsmeta.getColumnName(19)).isEqualTo("SCOPE_CATLOG");
assertThat(rsmeta.getColumnName(19)).isEqualTo("SCOPE_CATALOG");
assertThat(rsmeta.getColumnName(20)).isEqualTo("SCOPE_SCHEMA");
assertThat(rsmeta.getColumnName(21)).isEqualTo("SCOPE_TABLE");
assertThat(rsmeta.getColumnName(22)).isEqualTo("SOURCE_DATA_TYPE");
Expand Down

0 comments on commit 4429515

Please sign in to comment.