Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: include external tables in 'get_table_names' #363

Merged
merged 4 commits into from Oct 27, 2021
Merged

fix: include external tables in 'get_table_names' #363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
babcfe4
fix: include external tables in 'get_table_names'
tseaver Oct 26, 2021
3bd7305
Merge branch 'main' into 332-get_table_names-incl-external-tables
tswast Oct 26, 2021
e8bf0cb
Merge branch 'main' into 332-get_table_names-incl-external-tables
gcf-merge-on-green[bot] Oct 26, 2021
22f6f60
Merge branch 'main' into 332-get_table_names-incl-external-tables
gcf-merge-on-green[bot] Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions sqlalchemy_bigquery/base.py
View file
Open in desktop
Expand Up @@ -789,7 +789,7 @@ def create_connect_args(self, url):
)
return ([client], {})

def _get_table_or_view_names(self, connection, table_type, schema=None):
def _get_table_or_view_names(self, connection, item_types, schema=None):
current_schema = schema or self.dataset_id
get_table_name = (
self._build_formatted_table_id
Expand All @@ -810,7 +810,7 @@ def _get_table_or_view_names(self, connection, table_type, schema=None):
dataset.reference, page_size=self.list_tables_page_size
)
for table in tables:
if table_type == table.table_type:
if table.table_type in item_types:
result.append(get_table_name(table))
except google.api_core.exceptions.NotFound:
# It's possible that the dataset was deleted between when we
Expand Down Expand Up @@ -963,13 +963,15 @@ def get_table_names(self, connection, schema=None, **kw):
if isinstance(connection, Engine):
connection = connection.connect()

return self._get_table_or_view_names(connection, "TABLE", schema)
item_types = ["TABLE", "EXTERNAL"]
return self._get_table_or_view_names(connection, item_types, schema)

def get_view_names(self, connection, schema=None, **kw):
if isinstance(connection, Engine):
connection = connection.connect()

return self._get_table_or_view_names(connection, "VIEW", schema)
item_types = ["VIEW", "MATERIALIZED_VIEW"]
return self._get_table_or_view_names(connection, item_types, schema)

def do_rollback(self, dbapi_connection):
# BigQuery has no support for transactions.
Expand Down
8 changes: 6 additions & 2 deletions tests/unit/test_sqlalchemy_bigquery.py
View file
Open in desktop
Expand Up @@ -77,9 +77,11 @@ def table_item(dataset_id, table_id, type_="TABLE"):
[
table_item("dataset_2", "d2t1"),
table_item("dataset_2", "d2view", type_="VIEW"),
table_item("dataset_2", "d2ext", type_="EXTERNAL"),
table_item("dataset_2", "d2mv", type_="MATERIALIZED_VIEW"),
],
],
["dataset_1.d1t1", "dataset_1.d1t2", "dataset_2.d2t1"],
["dataset_1.d1t1", "dataset_1.d1t2", "dataset_2.d2t1", "dataset_2.d2ext"],
),
(
[dataset_item("dataset_1"), dataset_item("dataset_deleted")],
Expand Down Expand Up @@ -117,9 +119,11 @@ def test_get_table_names(
[
table_item("dataset_2", "d2t1"),
table_item("dataset_2", "d2view", type_="VIEW"),
table_item("dataset_2", "d2ext", type_="EXTERNAL"),
table_item("dataset_2", "d2mv", type_="MATERIALIZED_VIEW"),
],
],
["dataset_1.d1view", "dataset_2.d2view"],
["dataset_1.d1view", "dataset_2.d2view", "dataset_2.d2mv"],
),
(
[dataset_item("dataset_1"), dataset_item("dataset_deleted")],
Expand Down