feat: add uuid support (#1310)

Signed-off-by: Sri Harsha CH <sriharshach@google.com>
Co-authored-by: Subham Sinha <suvham@google.com>

Author: harshachinta

google/cloud/spanner_v1/_helpers.py

@@ -21,6 +21,7 @@
 importbase64
 importthreading
 importlogging
+importuuid
 
 fromgoogle.protobuf.struct_pb2importListValue
 fromgoogle.protobuf.struct_pb2importValue
@@ -298,6 +299,8 @@ def _make_value_pb(value):
 returnValue(string_value=base64.b64encode(value))
 ifisinstance(value, Interval):
 returnValue(string_value=str(value))
+ifisinstance(value, uuid.UUID):
+returnValue(string_value=str(value))
 
 raiseValueError("Unknown type: %s"% (value,))
 
@@ -399,6 +402,8 @@ def _get_type_decoder(field_type, field_name, column_info=None):
 return_parse_numeric
 eliftype_code==TypeCode.JSON:
 return_parse_json
+eliftype_code==TypeCode.UUID:
+return_parse_uuid
 eliftype_code==TypeCode.PROTO:
 returnlambdavalue_pb: _parse_proto(value_pb, column_info, field_name)
 eliftype_code==TypeCode.ENUM:
@@ -481,6 +486,10 @@ def _parse_json(value_pb):
 returnJsonObject.from_str(value_pb.string_value)
 
 
+def_parse_uuid(value_pb):
+returnuuid.UUID(value_pb.string_value)
+
+
 def_parse_proto(value_pb, column_info, field_name):
 bytes_value=base64.b64decode(value_pb.string_value)
 ifcolumn_infoisnotNoneandcolumn_info.get(field_name) isnotNone:

google/cloud/spanner_v1/param_types.py

@@ -33,6 +33,7 @@
 TIMESTAMP=Type(code=TypeCode.TIMESTAMP)
 NUMERIC=Type(code=TypeCode.NUMERIC)
 JSON=Type(code=TypeCode.JSON)
+UUID=Type(code=TypeCode.UUID)
 PG_NUMERIC=Type(code=TypeCode.NUMERIC, type_annotation=TypeAnnotationCode.PG_NUMERIC)
 PG_JSONB=Type(code=TypeCode.JSON, type_annotation=TypeAnnotationCode.PG_JSONB)
 PG_OID=Type(code=TypeCode.INT64, type_annotation=TypeAnnotationCode.PG_OID)

google/cloud/spanner_v1/streamed.py

@@ -394,6 +394,7 @@ def _merge_struct(lhs, rhs, type_):
 TypeCode.PROTO: _merge_string,
 TypeCode.INTERVAL: _merge_string,
 TypeCode.ENUM: _merge_string,
+TypeCode.UUID: _merge_string,
 }
 
 

tests/system/test_session_api.py

@@ -20,6 +20,7 @@
 importstruct
 importthreading
 importtime
+importuuid
 importpytest
 
 importgrpc
@@ -3056,6 +3057,18 @@ def test_execute_sql_returning_transfinite_floats(sessions_database, not_postgre
 assertmath.isnan(float_array[2])
 
 
+deftest_execute_sql_w_uuid_bindings(sessions_database, database_dialect):
+ifdatabase_dialect==DatabaseDialect.POSTGRESQL:
+pytest.skip("UUID parameter type is not yet supported in PostgreSQL dialect.")
+_bind_test_helper(
+sessions_database,
+database_dialect,
+spanner_v1.param_types.UUID,
+uuid.uuid4(),
+ [uuid.uuid4(), uuid.uuid4()],
+ )
+
+
 deftest_partition_query(sessions_database, not_emulator, not_experimental_host):
 row_count=40
 sql=f"SELECT * FROM {_sample_data.TABLE}"

tests/unit/test__helpers.py

@@ -14,6 +14,7 @@
 
 
 importunittest
+importuuid
 importmock
 
 fromopentelemetry.sdk.resourcesimportResource
@@ -786,6 +787,18 @@ def test_w_proto_enum(self):
 self._callFUT(value_pb, field_type, field_name, column_info), VALUE
  )
 
+deftest_w_uuid(self):
+fromgoogle.protobuf.struct_pb2importValue
+fromgoogle.cloud.spanner_v1importType
+fromgoogle.cloud.spanner_v1importTypeCode
+
+VALUE=uuid.uuid4()
+field_type=Type(code=TypeCode.UUID)
+field_name="uuid_column"
+value_pb=Value(string_value=str(VALUE))
+
+self.assertEqual(self._callFUT(value_pb, field_type, field_name), VALUE)
+
 
 classTest_parse_list_value_pbs(unittest.TestCase):
 def_callFUT(self, *args, **kw):