Merge branch 'development-build-v1.11.0.dev2' into grouping-rollup-cube

Author: kiraksi

AUTHORS

@@ -19,6 +19,7 @@ Maksym Voitko
 Maxim Zudilov (mxmzdlv)
 Maxime Beauchemin (mistercrunch)
 Romain Rigaux
+Sharoon Thomas (sharoonthomas)
 Sumedh Sakdeo
 Tim Swast (tswast)
 Vince Broz

CHANGELOG.md

@@ -13,6 +13,22 @@ Older versions of this project were distributed as [pybigquery][0].
 
 [2]: https://pypi.org/project/pybigquery/#history
 
+## [1.11.0.dev2](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.9.0...v1.11.0.dev2) (2024-02-01)
+
+## [1.11.0.dev1](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.9.0...v1.11.0.dev1) (2024-01-30)
+
+
+### Bug Fixes
+
+* Fix coverage test issues in SQLAlchemy migration ([#987](https://github.com/googleapis/python-bigquery-sqlalchemy/pull/987))
+* Cleanup test_sqlalchemy_dialect file for readability ([#1018](https://github.com/googleapis/python-bigquery-sqlalchemy/pull/1018))
+
+## [1.11.0.dev0](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.9.0...v1.11.0.dev0) (2024-01-25)
+
+
+### Features
+
+* Drop support for SQLAlchemy versions 1.2 and 1.3, maintain support for 1.4 and add support for 2.0 ([#920](https://github.com/googleapis/python-bigquery-sqlalchemy/pull/920))
 
 ## [1.9.0](https://github.com/googleapis/python-bigquery-sqlalchemy/compare/v1.8.0...v1.9.0) (2023-12-10)
 

README.rst

@@ -35,7 +35,8 @@ In order to use this library, you first need to go through the following steps:
 .. _Setup Authentication.: https://googleapis.dev/python/google-api-core/latest/auth.html
 
 .. note::
-   This library is only compatible with SQLAlchemy versions < 2.0.0
+   This library is a prerelease to gauge compatiblity with SQLAlchemy
+   versions >= 1.4.16 and < 2.1
 
 Installation
 ------------
@@ -108,7 +109,8 @@ SQLAlchemy
     from sqlalchemy.schema import *
     engine = create_engine('bigquery://project')
     table = Table('dataset.table', MetaData(bind=engine), autoload=True)
-    print(select([func.count('*')], from_obj=table).scalar())
+    print(select([func.count('*')], from_obj=table().scalar())
+
 
 Project
 ^^^^^^^
@@ -281,7 +283,7 @@ If you need additional control, you can supply a BigQuery client of your own:
 
     engine = create_engine(
         'bigquery://some-project/some-dataset?user_supplied_client=True',
-	connect_args={'client': custom_bq_client},
+	    connect_args={'client': custom_bq_client},
     )
 
 

noxfile.py

@@ -369,7 +369,7 @@ def compliance(session):
         session.skip("Compliance tests were not found")
 
     session.install("--pre", "grpcio")
-    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy<2.0.0")
+    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=1.4.16,<2.1")
     session.install(
         "mock",
         "pytest",
@@ -543,7 +543,7 @@ def prerelease_deps(session):
 
     prerel_deps = [
         "protobuf",
-        "sqlalchemy<2.0.0",
+        "sqlalchemy>=1.4.16,<2.1",
         # dependency of grpc
         "six",
         "googleapis-common-protos",

owlbot.py

@@ -42,14 +42,17 @@
     system_test_extras=extras,
     system_test_extras_by_python=extras_by_python,
 )
-s.move(templated_files, excludes=[
-    # sqlalchemy-bigquery was originally licensed MIT
-    "LICENSE", 
-    "docs/multiprocessing.rst",
-    # exclude gh actions as credentials are needed for tests
-    ".github/workflows",
-    "README.rst",
-])
+s.move(
+    templated_files,
+    excludes=[
+        # sqlalchemy-bigquery was originally licensed MIT
+        "LICENSE",
+        "docs/multiprocessing.rst",
+        # exclude gh actions as credentials are needed for tests
+        ".github/workflows",
+        "README.rst",
+    ],
+)
 
 # ----------------------------------------------------------------------------
 # Fixup files
@@ -59,7 +62,7 @@
     [".coveragerc"],
     "google/cloud/__init__.py",
     "sqlalchemy_bigquery/requirements.py",
-    )
+)
 
 s.replace(
     ["noxfile.py"],
@@ -75,48 +78,49 @@
 
 
 s.replace(
-    ["noxfile.py"], "--cov=google", "--cov=sqlalchemy_bigquery",
+    ["noxfile.py"],
+    "--cov=google",
+    "--cov=sqlalchemy_bigquery",
 )
 
 
 s.replace(
-    ["noxfile.py"], 
+    ["noxfile.py"],
     "\+ SYSTEM_TEST_EXTRAS",
     "",
 )
 
 
 s.replace(
     ["noxfile.py"],
-    '''"protobuf",
-        # dependency of grpc''',
-    '''"protobuf",
-        "sqlalchemy<2.0.0",
-        # dependency of grpc''',
+    """"protobuf",
+        # dependency of grpc""",
+    """"protobuf",
+        "sqlalchemy>=1.4.16,<2.1",
+        # dependency of grpc""",
 )
 
 
 s.replace(
     ["noxfile.py"],
     r"def default\(session\)",
-    "def default(session, install_extras=True)",    
+    "def default(session, install_extras=True)",
 )
 
 
-
-
 def place_before(path, text, *before_text, escape=None):
     replacement = "\n".join(before_text) + "\n" + text
     if escape:
         for c in escape:
-            text = text.replace(c, '\\' + c)
+            text = text.replace(c, "\\" + c)
     s.replace([path], text, replacement)
 
+
 place_before(
     "noxfile.py",
     "SYSTEM_TEST_PYTHON_VERSIONS=",
     "",
-    "# We're using two Python versions to test with sqlalchemy 1.3 and 1.4.",
+    "# We're using two Python versions to test with sqlalchemy>=1.4.16",
 )
 
 place_before(
@@ -126,15 +130,15 @@ def place_before(path, text, *before_text, escape=None):
 )
 
 
-install_logic = '''
+install_logic = """
     if install_extras and session.python in ["3.11", "3.12"]:
         install_target = ".[geography,alembic,tests,bqstorage]"
     elif install_extras:
         install_target = ".[all]"
     else:
         install_target = "."
     session.install("-e", install_target, "-c", constraints_path)
-'''
+"""
 
 place_before(
     "noxfile.py",
@@ -163,7 +167,7 @@ def compliance(session):
         session.skip("Compliance tests were not found")
 
     session.install("--pre", "grpcio")
-    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy<2.0.0") 
+    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=1.4.16,<2.1") 
     session.install(
         "mock",
         "pytest",
@@ -206,12 +210,11 @@ def compliance(session):
 '''
 
 place_before(
-     "noxfile.py",
-     "@nox.session(python=DEFAULT_PYTHON_VERSION)\n"
-     "def cover(session):",
-     compliance,
-     escape="()",
-     )
+    "noxfile.py",
+    "@nox.session(python=DEFAULT_PYTHON_VERSION)\n" "def cover(session):",
+    compliance,
+    escape="()",
+)
 
 s.replace(["noxfile.py"], '"alabaster"', '"alabaster", "geoalchemy2", "shapely"')
 
@@ -267,11 +270,10 @@ def system_noextras(session):
 
 place_before(
     "noxfile.py",
-    "@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1])\n"
-    "def compliance(session):", 
+    "@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1])\n" "def compliance(session):",
     system_noextras,
     escape="()[]",
-    )
+)
 
 
 # Add DB config for SQLAlchemy dialect test suite.
@@ -288,7 +290,7 @@ def system_noextras(session):
 [tool:pytest]
 addopts= --tb native -v -r fxX -p no:warnings
 python_files=tests/*test_*.py
-"""
+""",
 )
 
 # ----------------------------------------------------------------------------
@@ -299,7 +301,7 @@ def system_noextras(session):
 python.py_samples(skip_readmes=True)
 
 s.replace(
-    ["./samples/snippets/noxfile.py"], 
+    ["./samples/snippets/noxfile.py"],
     """session.install\("-e", _get_repo_root\(\)\)""",
     """session.install("-e", _get_repo_root())
     else:

samples/snippets/requirements.txt

@@ -28,6 +28,6 @@ requests==2.31.0
 rsa==4.9
 shapely==2.0.2
 six==1.16.0
-sqlalchemy===1.4.27
+sqlalchemy==1.4.16
 typing-extensions==4.9.0
 urllib3==2.1.0

setup.py

@@ -99,9 +99,9 @@ def readme():
         # Until this issue is closed
         # 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,<4.0.0dev",
+        "google-cloud-bigquery>=3.3.6,<4.0.0dev",
         "packaging",
-        "sqlalchemy>=1.2.0,<2.0.0dev",
+        "sqlalchemy>=1.4.16,<2.1",
     ],
     extras_require=extras,
     python_requires=">=3.8, <3.13",

sqlalchemy_bigquery/_struct.py

@@ -17,20 +17,14 @@
 # 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.
 
-import packaging.version
 import sqlalchemy.sql.default_comparator
 import sqlalchemy.sql.sqltypes
 import sqlalchemy.types
 
 from . import base
 
-sqlalchemy_1_4_or_more = packaging.version.parse(
-    sqlalchemy.__version__
-) >= packaging.version.parse("1.4")
-
-if sqlalchemy_1_4_or_more:
-    import sqlalchemy.sql.coercions
-    import sqlalchemy.sql.roles
+import sqlalchemy.sql.coercions
+import sqlalchemy.sql.roles
 
 
 def _get_subtype_col_spec(type_):
@@ -103,34 +97,20 @@ def _setup_getitem(self, name):
         def __getattr__(self, name):
             if name.lower() in self.expr.type._STRUCT_byname:
                 return self[name]
+            else:
+                raise AttributeError(name)
 
     comparator_factory = Comparator
 
 
-# In the implementations of _field_index below, we're stealing from
-# the JSON type implementation, but the code to steal changed in
-# 1.4. :/
-
-if sqlalchemy_1_4_or_more:
-
-    def _field_index(self, name, operator):
-        return sqlalchemy.sql.coercions.expect(
-            sqlalchemy.sql.roles.BinaryElementRole,
-            name,
-            expr=self.expr,
-            operator=operator,
-            bindparam_type=sqlalchemy.types.String(),
-        )
-
-else:
-
-    def _field_index(self, name, operator):
-        return sqlalchemy.sql.default_comparator._check_literal(
-            self.expr,
-            operator,
-            name,
-            bindparam_type=sqlalchemy.types.String(),
-        )
+def _field_index(self, name, operator):
+    return sqlalchemy.sql.coercions.expect(
+        sqlalchemy.sql.roles.BinaryElementRole,
+        name,
+        expr=self.expr,
+        operator=operator,
+        bindparam_type=sqlalchemy.types.String(),
+    )
 
 
 def struct_getitem_op(a, b):