Revert "feat: support SQLAlchemy 2.0, raise minimum required version to 1.4.x (googleapis#1053)"

This reverts commit 7a4c3c2.

Author: bnaul

AUTHORS

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

README.rst

@@ -34,6 +34,8 @@ In order to use this library, you first need to go through the following steps:
 .. _Enable the BigQuery Storage API.: https://console.cloud.google.com/apis/library/bigquery.googleapis.com
 .. _Setup Authentication.: https://googleapis.dev/python/google-api-core/latest/auth.html
 
+.. note::
+   This library is only compatible with SQLAlchemy versions < 2.0.0
 
 Installation
 ------------
@@ -106,8 +108,7 @@ 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
 ^^^^^^^
@@ -280,7 +281,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

@@ -368,6 +368,8 @@ def compliance(session):
     if not os.path.exists(system_test_folder_path):
         session.skip("Compliance tests were not found")
 
+    session.install("--pre", "grpcio")
+    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy<2.0.0")
     session.install(
         "mock",
         "pytest",
@@ -541,7 +543,7 @@ def prerelease_deps(session):
 
     prerel_deps = [
         "protobuf",
-        "sqlalchemy",
+        "sqlalchemy<2.0.0",
         # dependency of grpc
         "six",
         "googleapis-common-protos",

owlbot.py

@@ -42,17 +42,14 @@
     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
@@ -62,7 +59,7 @@
     [".coveragerc"],
     "google/cloud/__init__.py",
     "sqlalchemy_bigquery/requirements.py",
-)
+    )
 
 s.replace(
     ["noxfile.py"],
@@ -78,43 +75,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",
-        # dependency of grpc""",
+    '''"protobuf",
+        # dependency of grpc''',
+    '''"protobuf",
+        "sqlalchemy<2.0.0",
+        # 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.",
+)
 
 place_before(
     "noxfile.py",
@@ -123,15 +126,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",
@@ -159,6 +162,8 @@ def compliance(session):
     if not os.path.exists(system_test_folder_path):
         session.skip("Compliance tests were not found")
 
+    session.install("--pre", "grpcio")
+    session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy<2.0.0") 
     session.install(
         "mock",
         "pytest",
@@ -201,11 +206,12 @@ 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"')
 
@@ -261,10 +267,11 @@ 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.
@@ -281,7 +288,7 @@ def system_noextras(session):
 [tool:pytest]
 addopts= --tb native -v -r fxX -p no:warnings
 python_files=tests/*test_*.py
-""",
+"""
 )
 
 # ----------------------------------------------------------------------------
@@ -292,7 +299,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:

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>=3.3.6,<4.0.0dev",
+        "google-cloud-bigquery>=2.25.2,<4.0.0dev",
         "packaging",
-        "sqlalchemy>=1.4.16,<3.0.0dev",
+        "sqlalchemy>=1.2.0,<2.0.0dev",
     ],
     extras_require=extras,
     python_requires=">=3.8, <3.13",

sqlalchemy_bigquery/_struct.py

@@ -17,14 +17,20 @@
 # 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
 
-import sqlalchemy.sql.coercions
-import sqlalchemy.sql.roles
+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
 
 
 def _get_subtype_col_spec(type_):
@@ -97,20 +103,34 @@ 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
 
 
-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(),
-    )
+# 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 struct_getitem_op(a, b):