fix: add support for json data type

google/cloud/spanner_dbapi/parse_utils.py

@@ -38,6 +38,7 @@
     DateStr: spanner.param_types.DATE,
     TimestampStr: spanner.param_types.TIMESTAMP,
     decimal.Decimal: spanner.param_types.NUMERIC,
+    dict: spanner.param_types.JSON,
 }
 
 SPANNER_RESERVED_KEYWORDS = {

google/cloud/spanner_v1/_helpers.py

@@ -17,6 +17,7 @@
 import datetime
 import decimal
 import math
+import json
 
 import six
 
@@ -166,6 +167,10 @@ def _make_value_pb(value):
     if isinstance(value, decimal.Decimal):
         _assert_numeric_precision_and_scale(value)
         return Value(string_value=str(value))
+    if isinstance(value, dict):
+        return Value(
+            string_value=json.dumps(value, sort_keys=True, separators=(",", ":"),)
+        )
     raise ValueError("Unknown type: %s" % (value,))
 
 

google/cloud/spanner_v1/batch.py

@@ -118,8 +118,7 @@ def delete(self, table, keyset):
 
 
 class Batch(_BatchBase):
-    """Accumulate mutations for transmission during :meth:`commit`.
-    """
+    """Accumulate mutations for transmission during :meth:`commit`."""
 
     committed = None
     commit_stats = None

tests/system/test_dbapi.py

@@ -328,6 +328,53 @@ def test_DDL_autocommit(shared_instance, dbapi_database):
     conn.commit()
 
 
+@pytest.mark.skipif(_helpers.USE_EMULATOR, reason="Emulator does not support json.")
+def test_autocommit_with_json_data(shared_instance, dbapi_database):
+    """Check that DDLs in autocommit mode are immediately executed for
+    json fields."""
+    # Create table
+    conn = Connection(shared_instance, dbapi_database)
+    conn.autocommit = True
+
+    cur = conn.cursor()
+    cur.execute(
+        """
+        CREATE TABLE JsonDetails (
+            DataId     INT64 NOT NULL,
+            Details    JSON,
+        ) PRIMARY KEY (DataId)
+    """
+    )
+    conn.close()
+
+    # Insert data to table
+    conn = Connection(shared_instance, dbapi_database)
+    conn.autocommit = True
+    cur = conn.cursor()
+    cur.execute(
+        sql="INSERT INTO JsonDetails (DataId, Details) VALUES (%s, %s)",
+        args=(123, {"name": "Jakob", "age": "26"}),
+    )
+
+    # Read back the data.
+    conn = Connection(shared_instance, dbapi_database)
+    cur = conn.cursor()
+    cur.execute("""select * from JsonDetails;""")
+    got_rows = cur.fetchall()
+    conn.close()
+
+    # Assert the response
+    assert len(got_rows) == 1
+    assert got_rows[0][0] == 123
+    assert got_rows[0][1] == '{"age":"26","name":"Jakob"}'
+
+    # Drop the table
+    conn = Connection(shared_instance, dbapi_database)
+    cur = conn.cursor()
+    cur.execute("DROP TABLE JsonDetails")
+    conn.commit()
+
+
 def test_DDL_commit(shared_instance, dbapi_database):
     """Check that DDLs in commit mode are executed on calling `commit()`."""
     conn = Connection(shared_instance, dbapi_database)