Skip to content

Commit 36ab57c

Browse files
cathleenyIsaac
andcommitted
Merge main into cathleeny/fix-inline-in-list-rendering
Brings in #1015, which scopes the GetColumns e2e test to the current catalog and bumps oauthlib to 4.0.1. Co-authored-by: Isaac <no-reply@databricks.com> Signed-off-by: Cathleen Yan <58714163+cathleeny@users.noreply.github.com>
2 parents 7256b6b + bfd1f24 commit 36ab57c

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎poetry.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/e2e/test_driver.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ def test_get_tables(self):
559559

560560
def test_get_columns(self):
561561
with self.cursor({}) as cursor:
562+
cursor.execute("SELECT current_catalog()")
563+
catalog_name = cursor.fetchone()[0]
562564
table_name = "table_{uuid}".format(uuid=str(uuid4()).replace("-", "_"))
563565
table_names = [table_name + "_1", table_name + "_2"]
564566

@@ -573,7 +575,11 @@ def test_get_columns(self):
573575
"array('item1', 'item2', 'item3') as col_5)".format(table)
574576
)
575577

576-
cursor.columns(schema_name="defa%", table_name=table_name + "%")
578+
cursor.columns(
579+
catalog_name=catalog_name,
580+
schema_name="defa%",
581+
table_name=table_name + "%",
582+
)
577583
cols = cursor.fetchall()
578584
cols_desc = cursor.description
579585

0 commit comments

Comments
 (0)