Skip to content

test: compare schema fields instead of strings in alembic test #384

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

Merged
tswast merged 6 commits into from
Dec 30, 2021
Merged

test: compare schema fields instead of strings in alembic test #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8921d5
test: failing alembic test compares structured objects instead of str…
tswast Dec 29, 2021
6831b1d
🦉 Updates from OwlBot
gcf-owl-bot[bot] Dec 29, 2021
b8387b2
Merge branch 'main' into issue373-test_alembic_scenario
tswast Dec 29, 2021
f32d900
temporarily cap max sqlalchemy while we debug failing compliance tests
tswast Dec 30, 2021
c800e95
Merge branch 'issue373-test_alembic_scenario' of github.com:googleapi…
tswast Dec 30, 2021
878128b
document pin
tswast Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ def readme():
# https://github.com/googleapis/google-cloud-python/issues/10566
"google-auth>=1.25.0,<3.0.0dev", # Work around pip wack.
"google-cloud-bigquery>=2.25.2,<3.0.0dev",
"sqlalchemy>=1.2.0,<1.5.0dev",
# Temporarily set maximimum sqlalchemy to a known-working version while
# we debug failing compliance tests. See:
# https://github.com/googleapis/python-bigquery-sqlalchemy/issues/386
# and
# https://github.com/googleapis/python-bigquery-sqlalchemy/issues/385
"sqlalchemy>=1.2.0,<=1.4.25",
"future",
],
extras_require=extras,
Expand Down
40 changes: 18 additions & 22 deletions tests/system/test_alembic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from sqlalchemy import Column, DateTime, Integer, String

import google.api_core.exceptions
from google.cloud.bigquery import SchemaField

alembic = pytest.importorskip("alembic")

Expand All @@ -43,10 +44,7 @@ def get_table(table_name, data="table"):
if data == "table":
return table
elif data == "schema":
return [
repr(s).replace(", (), None)", ")").replace(", None)", ")")
for s in table.schema
]
return table.schema
else:
raise ValueError(data)
except google.api_core.exceptions.NotFound:
Expand Down Expand Up @@ -78,9 +76,9 @@ def test_alembic_scenario(alembic_table):
Column("description", String(200)),
)
assert alembic_table("account", "schema") == [
"SchemaField('id', 'INTEGER', 'REQUIRED', None, (), ())",
"SchemaField('name', 'STRING(50)', 'REQUIRED', 'The name', (), ())",
"SchemaField('description', 'STRING(200)', 'NULLABLE', None, (), ())",
SchemaField("id", "INTEGER", "REQUIRED"),
SchemaField("name", "STRING(50)", "REQUIRED", description="The name"),
SchemaField("description", "STRING(200)"),
]

op.bulk_insert(
Expand All @@ -103,11 +101,10 @@ def test_alembic_scenario(alembic_table):
)

assert alembic_table("account", "schema") == [
"SchemaField('id', 'INTEGER', 'REQUIRED', None, (), ())",
"SchemaField('name', 'STRING(50)', 'REQUIRED', 'The name', (), ())",
"SchemaField('description', 'STRING(200)', 'NULLABLE', None, (), ())",
"SchemaField('last_transaction_date', 'DATETIME', 'NULLABLE', 'when updated'"
", (), ())",
SchemaField("id", "INTEGER", "REQUIRED"),
SchemaField("name", "STRING(50)", "REQUIRED", description="The name"),
SchemaField("description", "STRING(200)"),
SchemaField("last_transaction_date", "DATETIME", description="when updated"),
]

op.create_table(
Expand All @@ -123,8 +120,8 @@ def test_alembic_scenario(alembic_table):

op.drop_column("account_w_comment", "description")
assert alembic_table("account_w_comment", "schema") == [
"SchemaField('id', 'INTEGER', 'REQUIRED', None, (), ())",
"SchemaField('name', 'STRING(50)', 'REQUIRED', 'The name', (), ())",
SchemaField("id", "INTEGER", "REQUIRED"),
SchemaField("name", "STRING(50)", "REQUIRED", description="The name"),
]

op.drop_table("account_w_comment")
Expand All @@ -133,11 +130,10 @@ def test_alembic_scenario(alembic_table):
op.rename_table("account", "accounts")
assert alembic_table("account") is None
assert alembic_table("accounts", "schema") == [
"SchemaField('id', 'INTEGER', 'REQUIRED', None, (), ())",
"SchemaField('name', 'STRING(50)', 'REQUIRED', 'The name', (), ())",
"SchemaField('description', 'STRING(200)', 'NULLABLE', None, (), ())",
"SchemaField('last_transaction_date', 'DATETIME', 'NULLABLE', 'when updated'"
", (), ())",
SchemaField("id", "INTEGER", "REQUIRED"),
SchemaField("name", "STRING(50)", "REQUIRED", description="The name"),
SchemaField("description", "STRING(200)"),
SchemaField("last_transaction_date", "DATETIME", description="when updated"),
]
op.drop_table("accounts")
assert alembic_table("accounts") is None
Expand All @@ -157,9 +153,9 @@ def test_alembic_scenario(alembic_table):
# nullable:
op.alter_column("transactions", "amount", True)
assert alembic_table("transactions", "schema") == [
"SchemaField('account', 'INTEGER', 'REQUIRED', None, (), ())",
"SchemaField('transaction_time', 'DATETIME', 'REQUIRED', None, (), ())",
"SchemaField('amount', 'NUMERIC(11, 2)', 'NULLABLE', None, (), ())",
SchemaField("account", "INTEGER", "REQUIRED"),
SchemaField("transaction_time", "DATETIME", "REQUIRED"),
SchemaField("amount", "NUMERIC(11, 2)"),
]

op.create_table_comment("transactions", "Transaction log")
Expand Down