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.

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

feat: Comment/description support, bug fixes and better test coverage #138

Merged
merged 159 commits into from May 12, 2021
Merged
Show file tree
Hide file tree
Changes from 147 commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
0fc64fa
Fixed a dependency problem that caysed test failures in Python 3.6.
jimfulton Apr 12, 2021
bfdda68
Started implementing SqlAlchemy dialect-compliance tests
jimfulton Apr 15, 2021
41cb2dd
Handle parameters in in
jimfulton Apr 15, 2021
631c060
fixed regex to allow multi-character parameter names.
jimfulton Apr 15, 2021
aa85cb9
Fixed rendering of string literals.
jimfulton Apr 16, 2021
c7da257
Provide default values for primary keys and other fixes...
jimfulton Apr 16, 2021
3916239
Narrowed skips and license comment diagnosed reasons for skipped fail…
jimfulton Apr 16, 2021
46b30b4
use Google license
jimfulton Apr 16, 2021
36a0033
Fixed like (% and _) escapes.
jimfulton Apr 19, 2021
d079fbe
Handle BIGNUMERIC
jimfulton Apr 19, 2021
7e60691
Skip tests that want to stpre floats as numeric.
jimfulton Apr 19, 2021
4a1bafd
skip tests for offsets without limits. BigQuery doesn't allow that.
jimfulton Apr 19, 2021
e07b1f0
BIGNUMERIC lets us handle many significant digits.test_many_significa…
jimfulton Apr 19, 2021
656af06
Skip LongNameBlowoutTest because it requires features (indexes, prima…
jimfulton Apr 19, 2021
a085db6
We have to rewrite these tests, because of forcing use_labels=True
jimfulton Apr 19, 2021
681ea47
BigQuery returns deleted and updated rows, which SQLAlchemy doesn't e…
jimfulton Apr 19, 2021
cde5bf8
Fixed a dependency problem that caysed test failures in Python 3.6.
jimfulton Apr 12, 2021
76cf078
Provide a bigquery mock based on sqlite
jimfulton Apr 20, 2021
ee46a1e
Don't force labels in select.
jimfulton Apr 20, 2021
62432a3
merge riversnake-fix-78
jimfulton Apr 20, 2021
a54b946
No need to work around forced labels anymore.
jimfulton Apr 22, 2021
1320f32
Updated sqlite-bases mock
jimfulton Apr 22, 2021
4f098fd
Added test that types are injected into parameter placeholders.
jimfulton Apr 22, 2021
2c76342
Oops, need to call super even when there are where clauses.
jimfulton Apr 22, 2021
68f9043
When SQLAlchemy thinks it knows a parameter type, include it in the p…
jimfulton Apr 23, 2021
be1e215
Don't skip some numeric tests and skip some CTE tests
jimfulton Apr 23, 2021
39f1955
Can't coerce datetime to date.
jimfulton Apr 23, 2021
9e266f2
reenable some tests now that we pass type infor to bigquery
jimfulton Apr 23, 2021
fa84c95
Enable error on warnings -- a test depends on it.
jimfulton Apr 24, 2021
b01d2ce
Added table and column comment support.
jimfulton Apr 24, 2021
dc91449
get_schema_names should return all of the schema names.
jimfulton Apr 24, 2021
3743abe
Retrieval of view definitions.
jimfulton Apr 24, 2021
dcc7e45
handle dateish literals.
jimfulton Apr 24, 2021
163d031
BigQuery doesn't want schema names in column names.
jimfulton Apr 24, 2021
c47a83d
Allow mutating table descriptions/comments.
jimfulton Apr 24, 2021
9444c20
skip tests that depend on BigQuery keeping track of column details.
jimfulton Apr 24, 2021
30c8ed7
Handle TIMESTAMP literals.
jimfulton Apr 24, 2021
0ef4909
Fixed some broken TIMESTAMP tests.
jimfulton Apr 24, 2021
99629cf
enabled more tests.
jimfulton Apr 24, 2021
5e6e48d
remove extra lines.
jimfulton Apr 26, 2021
83feb1e
blacken
jimfulton Apr 26, 2021
896a082
added missing test for api.py
jimfulton Apr 26, 2021
497cc90
Ignore flake8 complaint about * import.
jimfulton Apr 26, 2021
7e5399a
lint and minor cleanup
jimfulton Apr 26, 2021
e48dd58
Removed unused variable.
jimfulton Apr 26, 2021
395a2d4
Get to 100% coverage in test_parse_url
jimfulton Apr 26, 2021
07af7ef
Don't need because we can't test temp tables
jimfulton Apr 27, 2021
ea99108
requirements.py -- It's used by compliance testing.
jimfulton Apr 27, 2021
7039f05
Added Binary literal handling, and ...
jimfulton Apr 27, 2021
0f2d315
Updated fauxdb to correct for some sqlite differences.
jimfulton Apr 27, 2021
9db1e3b
Fixed santy check
jimfulton Apr 27, 2021
50e3448
blackened
jimfulton Apr 27, 2021
f449c5e
Added a test that exercises type handling for all the types.
jimfulton Apr 27, 2021
d000075
Added table reference tests
jimfulton Apr 28, 2021
190136e
test get_view_definition
jimfulton Apr 28, 2021
acdd4d2
removed a private function that's never called.
jimfulton Apr 28, 2021
3e73a0a
table and view list tests
jimfulton Apr 28, 2021
4c6d72d
Moar unit tests and coverage
jimfulton Apr 29, 2021
349269f
use latest bg release, because we depend on changes there.
jimfulton Apr 29, 2021
717dd77
removed breakpoint that shouldn't have been checked in.
jimfulton Apr 29, 2021
7ba7813
Bypass google authentication.
jimfulton Apr 30, 2021
c22565e
Test JSON deserialization.
jimfulton Apr 30, 2021
dc246ae
Test getting project id from authentication.
jimfulton Apr 30, 2021
b914ee3
removed some unneeded code.
jimfulton Apr 30, 2021
a7e49e9
Simplify string and binary literal processors to not expect None.
jimfulton Apr 30, 2021
53883d5
Tested comment support
jimfulton Apr 30, 2021
5b1e77e
Cleaned up comment handling.
jimfulton Apr 30, 2021
beaf0b6
generalized options handling.
jimfulton Apr 30, 2021
8236d5b
test dialect-options handling.
jimfulton Apr 30, 2021
8e41b4d
constraints are ignored.
jimfulton Apr 30, 2021
e9c5175
Better binary-literal hack
jimfulton May 3, 2021
7835d2c
added tests for BIGNUMERIC.
jimfulton May 3, 2021
dda37eb
Major rework using pickle to overcome type differences.
jimfulton May 3, 2021
b774f79
Added array support
jimfulton May 3, 2021
7a31d12
blacken
jimfulton May 3, 2021
78be3cf
replaced an unreachable branch with an assert.
jimfulton May 3, 2021
297e532
lint
jimfulton May 3, 2021
0adebe1
Enable generation of random primary keys when running compliance tests.
jimfulton May 3, 2021
21121e9
Run the select a couple of ways and assert result.
jimfulton May 3, 2021
b942a61
Only generate random primary keys when running compliance tests.
jimfulton May 3, 2021
4aeb0db
addd fetchall, needed by a test.
jimfulton May 4, 2021
a8add9e
Port compliance tests
jimfulton May 4, 2021
04aaee4
record when array size is set.
jimfulton May 4, 2021
0e081a0
Added a tiny metadata convenience.
jimfulton May 4, 2021
6fe196e
Added arraysize tests.
jimfulton May 4, 2021
67733fd
exercise labels
jimfulton May 4, 2021
725c5d5
Make sure label names are legal identifiers
jimfulton May 4, 2021
cb56463
test disable quoting
jimfulton May 4, 2021
58c3d55
simplifed a test.
jimfulton May 4, 2021
d8e464a
Test forcing quote (even though quotes are forced anyway)
jimfulton May 4, 2021
fabd4c6
Be more careful about doubled %s.
jimfulton May 4, 2021
5cf4009
ported test for %%s
jimfulton May 4, 2021
33642ff
Added IN tests.
jimfulton May 4, 2021
401ad3b
handle UNNEST
jimfulton May 4, 2021
2313f54
"inlined" some helper attrs
jimfulton May 4, 2021
7e57563
moved setup_table to central location
jimfulton May 4, 2021
534a819
ported a test that deals with bind params with indeterminate types
jimfulton May 4, 2021
32f6b95
leverage setup_table
jimfulton May 4, 2021
c762a9c
added a test based on sqlalchemy.testing.suite.test_select.LikeFuncti…
jimfulton May 4, 2021
492530b
leverage setup_table
jimfulton May 4, 2021
15ba275
Added test for labels in group by
jimfulton May 4, 2021
a65bd1a
Added a test for compiling a single column.
jimfulton May 5, 2021
ab873aa
Trying to compile a nameless column gives a meaningful error.
jimfulton May 5, 2021
b1224c3
Get 100% coverage of fauxdbi
jimfulton May 5, 2021
ba21553
Simplified quote decision.
jimfulton May 5, 2021
445832e
Specify proto 4 when pickling, to get predictable behavior across Pyt…
jimfulton May 5, 2021
2ef50bd
Some tests require sqlalchemy 1.3
jimfulton May 5, 2021
5cd127a
require 100% test coverage.
jimfulton May 5, 2021
ed81f2c
need newer sqlalchemy and google-auth
jimfulton May 5, 2021
28e4f40
need sqlalchemy 1.2 because comments.
jimfulton May 5, 2021
9616813
blacken/lint
jimfulton May 5, 2021
0b1e85e
Added code to cleanup schemas at start to avoid spurious errors.
jimfulton May 5, 2021
00d61f4
added copyright
jimfulton May 5, 2021
c58f5f1
added copyright
jimfulton May 5, 2021
7e826e1
fixed copyright
jimfulton May 5, 2021
b469f3f
Updated the compliance setup
jimfulton May 5, 2021
c021366
added copyright
jimfulton May 5, 2021
5af39be
added copyright
jimfulton May 5, 2021
a2e92a3
added copyright
jimfulton May 5, 2021
e85558b
added copyright
jimfulton May 5, 2021
c683b52
added copyright
jimfulton May 5, 2021
b7bc62b
blacken
jimfulton May 5, 2021
69c1d40
merge master
jimfulton May 5, 2021
62d8df2
Make operational errors more informative.
jimfulton May 5, 2021
b2ac135
Fixed better debugging support.
jimfulton May 6, 2021
e5e9786
lint first
jimfulton May 6, 2021
7625e61
Don't use upsert to update comments.
jimfulton May 6, 2021
410b9ac
Older sqlite don't have true and false.
jimfulton May 6, 2021
0b8e3f0
Ignore test debugging info added to deal with sqlite3 differences.
jimfulton May 6, 2021
fa303d7
blacken
jimfulton May 6, 2021
87f2846
Added minimal requirement for google-api-core to be consistent with s…
jimfulton May 10, 2021
dc28277
Make the google-auth requirement consistent with the Python 3.6 test …
jimfulton May 10, 2021
159fd18
chore(revert): revert preventing normalization (#132)
dandhlee Apr 27, 2021
05528af
Explain why we add where clauses in delete statements that lack them
jimfulton May 10, 2021
2db2dd4
Added a missing _ and explained \d+s in a regex
jimfulton May 10, 2021
8ea13de
Fixed: didn't properly handle expansion of single-item arrays.
jimfulton May 10, 2021
ae03721
Added test for expansion of single-element arrays
jimfulton May 10, 2021
486873b
Avoid having to use an `_` to ignore a re group we don't care about.
jimfulton May 10, 2021
a897d60
Added some comments for the tricky _get_field method.
jimfulton May 10, 2021
6e4d5d6
Commented the pickle-protocol 4 prefixes we're looking for.
jimfulton May 10, 2021
708f5db
explain use of pickle.
jimfulton May 10, 2021
eeaae87
typo
jimfulton May 10, 2021
ce6181f
BigQuery 2.15 wants google-api-core >= 1.23.0
jimfulton May 10, 2021
877106b
blacken
jimfulton May 10, 2021
ddd3399
don't need to call out the project in the test config.
jimfulton May 10, 2021
e063e3e
Try sleeping between tests to see if we can avoid some weird failures.
jimfulton May 10, 2021
7530acf
some minimal docs on the dialect tests.
jimfulton May 10, 2021
4d99090
Update tests/sqlalchemy_dialect_compliance/README.rst
jimfulton May 11, 2021
6b2a6b6
Update tests/sqlalchemy_dialect_compliance/README.rst
jimfulton May 11, 2021
bc40df2
simplify by getting rid of unnecessary and broken overrriding.
jimfulton May 11, 2021
ec4961c
merge upstream
jimfulton May 11, 2021
16e302d
Try sleeping longer to avoid races between tests.
jimfulton May 11, 2021
1e11ce2
make sure we wait for the drops at the beginning of the session.
jimfulton May 11, 2021
ff35acf
rerun on table not found
jimfulton May 11, 2021
b4c3c23
Try simpler regex
jimfulton May 11, 2021
18ebe26
Try different error
jimfulton May 11, 2021
fbbd563
don't sleep between tests.
jimfulton May 11, 2021
a103ae8
blacken
jimfulton May 11, 2021
5809a9c
removed unused import
jimfulton May 11, 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
4 changes: 1 addition & 3 deletions .coveragerc
Expand Up @@ -17,8 +17,6 @@
# Generated by synthtool. DO NOT EDIT!
[run]
branch = True
omit =
google/cloud/__init__.py

[report]
fail_under = 100
Expand All @@ -35,4 +33,4 @@ omit =
*/proto/*.py
*/core/*.py
*/site-packages/*.py
google/cloud/__init__.py
pybigquery/requirements.py
57 changes: 53 additions & 4 deletions noxfile.py
Expand Up @@ -28,17 +28,18 @@
BLACK_PATHS = ["docs", "pybigquery", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.8"
SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
SYSTEM_TEST_PYTHON_VERSIONS = ["3.9"]
UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

# 'docfx' is excluded since it only needs to run in 'docs-presubmit'
nox.options.sessions = [
"lint",
"unit",
"system",
"cover",
"lint",
"system",
"compliance",
"lint_setup_py",
"blacken",
"docs",
Expand Down Expand Up @@ -169,6 +170,54 @@ def system(session):
)


@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
def compliance(session):
"""Run the system test suite."""
constraints_path = str(
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
)
system_test_folder_path = os.path.join("tests", "sqlalchemy_dialect_compliance")

# Check the value of `RUN_SYSTEM_TESTS` env var. It defaults to true.
if os.environ.get("RUN_COMPLIANCE_TESTS", "true") == "false":
plamut marked this conversation as resolved.
Show resolved Hide resolved
session.skip("RUN_COMPLIANCE_TESTS is set to false, skipping")
# Sanity check: Only run tests if the environment variable is set.
if not os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", ""):
session.skip("Credentials must be set via environment variable")
# Install pyopenssl for mTLS testing.
if os.environ.get("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true":
session.install("pyopenssl")
# Sanity check: only run tests if found.
if not os.path.exists(system_test_folder_path):
session.skip("Compliance tests were not found")

# Use pre-release gRPC for system tests.
session.install("--pre", "grpcio")

# Install all test dependencies, then install this package into the
# virtualenv's dist-packages.
session.install(
"mock",
"pytest",
"pytest-rerunfailures",
"google-cloud-testutils",
"-c",
constraints_path,
)
session.install("-e", ".", "-c", constraints_path)

session.run(
"py.test",
"-vv",
f"--junitxml=compliance_{session.python}_sponge_log.xml",
"--reruns=3",
"--reruns-delay=60",
"--only-rerun=403 Exceeded rate limits|409 Already Exists",
system_test_folder_path,
*session.posargs,
)


@nox.session(python=DEFAULT_PYTHON_VERSION)
def cover(session):
"""Run the final coverage report.
Expand All @@ -177,7 +226,7 @@ def cover(session):
test runs (not system test runs), and then erases coverage data.
"""
session.install("coverage", "pytest-cov")
session.run("coverage", "report", "--show-missing", "--fail-under=50")
session.run("coverage", "report", "--show-missing", "--fail-under=100")

session.run("coverage", "erase")

Expand Down
220 changes: 220 additions & 0 deletions pybigquery/requirements.py
@@ -0,0 +1,220 @@
# Copyright (c) 2021 The PyBigQuery Authors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy of
# this software and associated documentation files (the "Software"), to deal in
# the Software without restriction, including without limitation the rights to
# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
# the Software, and to permit persons to whom the Software is furnished to do so,
# subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""
This module is used by the compliance tests to control which tests are run

based on database capabilities.
"""

import sqlalchemy.testing.requirements
import sqlalchemy.testing.exclusions

supported = sqlalchemy.testing.exclusions.open
unsupported = sqlalchemy.testing.exclusions.closed


class Requirements(sqlalchemy.testing.requirements.SuiteRequirements):
@property
def index_reflection(self):
return unsupported()

@property
def indexes_with_ascdesc(self):
"""target database supports CREATE INDEX with per-column ASC/DESC."""
return unsupported()

@property
def unique_constraint_reflection(self):
"""target dialect supports reflection of unique constraints"""
return unsupported()

@property
def autoincrement_insert(self):
"""target platform generates new surrogate integer primary key values
when insert() is executed, excluding the pk column."""
return unsupported()

@property
def primary_key_constraint_reflection(self):
return unsupported()

@property
def foreign_keys(self):
"""Target database must support foreign keys."""

return unsupported()

@property
def foreign_key_constraint_reflection(self):
return unsupported()

@property
def on_update_cascade(self):
"""target database must support ON UPDATE..CASCADE behavior in
foreign keys."""

return unsupported()

@property
def named_constraints(self):
"""target database must support names for constraints."""

return unsupported()

@property
def temp_table_reflection(self):
return unsupported()

@property
def temporary_tables(self):
"""target database supports temporary tables"""
return unsupported() # Temporary tables require use of scripts.

@property
def duplicate_key_raises_integrity_error(self):
"""target dialect raises IntegrityError when reporting an INSERT
with a primary key violation. (hint: it should)

"""
return unsupported()

@property
def precision_numerics_many_significant_digits(self):
"""target backend supports values with many digits on both sides,
such as 319438950232418390.273596, 87673.594069654243

"""
return supported()

@property
def date_coerces_from_datetime(self):
"""target dialect accepts a datetime object as the target
of a date column."""

# BigQuery doesn't allow saving a datetime in a date:
# `TYPE_DATE`, Invalid date: '2012-10-15T12:57:18'

return unsupported()

@property
def window_functions(self):
"""Target database must support window functions."""
return supported() # There are no tests for this. <shrug>

@property
def ctes(self):
"""Target database supports CTEs"""

return supported()

@property
def views(self):
"""Target database must support VIEWs."""

return supported()

@property
def schemas(self):
"""Target database must support external schemas, and have one
named 'test_schema'."""

return supported()

@property
def implicit_default_schema(self):
"""target system has a strong concept of 'default' schema that can
be referred to implicitly.

basically, PostgreSQL.

"""
return supported()

@property
def comment_reflection(self):
return supported() # Well, probably not, but we'll try. :)

@property
def unicode_ddl(self):
"""Target driver must support some degree of non-ascii symbol
names.
"""
return supported()

@property
def datetime_literals(self):
"""target dialect supports rendering of a date, time, or datetime as a
literal string, e.g. via the TypeEngine.literal_processor() method.

"""

return supported()

@property
def timestamp_microseconds(self):
"""target dialect supports representation of Python
datetime.datetime() with microsecond objects but only
if TIMESTAMP is used."""
return supported()

@property
def datetime_historic(self):
"""target dialect supports representation of Python
datetime.datetime() objects with historic (pre 1970) values."""

return supported()

@property
def date_historic(self):
"""target dialect supports representation of Python
datetime.datetime() objects with historic (pre 1970) values."""

return supported()

@property
def precision_numerics_enotation_small(self):
"""target backend supports Decimal() objects using E notation
to represent very small values."""
return supported()

@property
def precision_numerics_enotation_large(self):
"""target backend supports Decimal() objects using E notation
to represent very large values."""
return supported()

@property
def update_from(self):
"""Target must support UPDATE..FROM syntax"""
return supported()

@property
def order_by_label_with_expression(self):
"""target backend supports ORDER BY a column label within an
expression.

Basically this::

select data as foo from test order by foo || 'bar'

Lots of databases including PostgreSQL don't support this,
so this is off by default.

"""
return supported()