move bindparam workaround to visit_JSON

r1b · r1b · commit 65d676d3a06b · 2024-12-11T16:42:50.000-05:00
diff --git a/sqlalchemy_bigquery/base.py b/sqlalchemy_bigquery/base.py
@@ -548,10 +548,7 @@ def visit_bindparam(
         bq_type = self.__remove_type_parameter(bq_type)
 
         if bq_type == "JSON":
-            # FIXME: JSON is not a member of `SqlParameterScalarTypes` in the DBAPI
-            # For now, we hack around this by:
-            # - Rewriting the bindparam type to STRING
-            # - Applying a bind expression that converts the parameter back to JSON
+
             bq_type = "STRING"
 
         assert_(param != "%s", f"Unexpected param: {param}")
@@ -649,6 +646,14 @@ def visit_NUMERIC(self, type_, **kw):
     visit_DECIMAL = visit_NUMERIC
 
     def visit_JSON(self, type_, **kw):
+        if isinstance(
+            kw.get("type_expression"), sqlalchemy.sql.expression.BindParameter
+        ):  # bindparam
+            # FIXME: JSON is not a member of `SqlParameterScalarTypes` in the DBAPI
+            # For now, we hack around this by:
+            # - Rewriting the bindparam type to STRING
+            # - Applying a bind expression that converts the parameter back to JSON
+            return "STRING"
         return "JSON"
 
 
