Skip to content

Commit 070b931

Browse files
verif: TABLE_COLUMNS from jdbc
Signed-off-by: varun-edachali-dbx <[email protected]>
1 parent 946e513 commit 070b931

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

src/databricks/sql/backend/sea/utils/metadata_mappings.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,23 @@ class MetadataColumnMappings:
1515
)
1616

1717
CATALOG_COLUMN = ResultColumn("TABLE_CAT", "catalogName", SqlType.VARCHAR)
18-
1918
SCHEMA_COLUMN = ResultColumn("TABLE_SCHEM", "namespace", SqlType.VARCHAR)
20-
2119
TABLE_NAME_COLUMN = ResultColumn("TABLE_NAME", "tableName", SqlType.VARCHAR)
2220
TABLE_TYPE_COLUMN = ResultColumn("TABLE_TYPE", "tableType", SqlType.VARCHAR)
2321
REMARKS_COLUMN = ResultColumn("REMARKS", "remarks", SqlType.VARCHAR)
22+
TYPE_CATALOG_COLUMN = ResultColumn(
23+
"TYPE_CAT", "TYPE_CATALOG_COLUMN", SqlType.VARCHAR
24+
)
25+
TYPE_SCHEM_COLUMN = ResultColumn(
26+
"TYPE_SCHEM", "TYPE_SCHEMA_COLUMN", SqlType.VARCHAR
27+
)
28+
TYPE_NAME_COLUMN = ResultColumn("TYPE_NAME", "TYPE_NAME", SqlType.VARCHAR)
29+
SELF_REFERENCING_COL_NAME_COLUMN = ResultColumn(
30+
"SELF_REFERENCING_COL_NAME", "SELF_REFERENCING_COLUMN_NAME", SqlType.VARCHAR
31+
)
32+
REF_GENERATION_COLUMN = ResultColumn(
33+
"REF_GENERATION", "REF_GENERATION_COLUMN", SqlType.VARCHAR
34+
)
2435

2536
# Columns specific to getColumns()
2637
COLUMN_NAME_COLUMN = ResultColumn("COLUMN_NAME", "col_name", SqlType.VARCHAR)
@@ -48,13 +59,6 @@ class MetadataColumnMappings:
4859
IS_NULLABLE_COLUMN = ResultColumn("IS_NULLABLE", "isNullable", SqlType.VARCHAR)
4960

5061
# Columns for getTables() that don't exist in SEA
51-
TYPE_CAT_COLUMN = ResultColumn("TYPE_CAT", None, SqlType.VARCHAR)
52-
TYPE_SCHEM_COLUMN = ResultColumn("TYPE_SCHEM", None, SqlType.VARCHAR)
53-
TYPE_NAME_COLUMN = ResultColumn("TYPE_NAME", None, SqlType.VARCHAR)
54-
SELF_REFERENCING_COL_NAME_COLUMN = ResultColumn(
55-
"SELF_REFERENCING_COL_NAME", None, SqlType.VARCHAR
56-
)
57-
REF_GENERATION_COLUMN = ResultColumn("REF_GENERATION", None, SqlType.VARCHAR)
5862

5963
SCOPE_CATALOG_COLUMN = ResultColumn("SCOPE_CATALOG", None, SqlType.VARCHAR)
6064
SCOPE_SCHEMA_COLUMN = ResultColumn("SCOPE_SCHEMA", None, SqlType.VARCHAR)
@@ -79,12 +83,12 @@ class MetadataColumnMappings:
7983
]
8084

8185
TABLE_COLUMNS = [
82-
CATALOG_COLUMN, # Use general catalog column (catalogName)
86+
CATALOG_COLUMN,
8387
SCHEMA_COLUMN,
8488
TABLE_NAME_COLUMN,
8589
TABLE_TYPE_COLUMN,
8690
REMARKS_COLUMN,
87-
TYPE_CAT_COLUMN,
91+
TYPE_CATALOG_COLUMN,
8892
TYPE_SCHEM_COLUMN,
8993
TYPE_NAME_COLUMN,
9094
SELF_REFERENCING_COL_NAME_COLUMN,

0 commit comments

Comments
 (0)