google-cloud-spanner 3.43.0__tar.gz → 3.45.0__tar.gz

{google-cloud-spanner-3.43.0/google_cloud_spanner.egg-info → google-cloud-spanner-3.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-spanner
-Version: 3.43.0
+Version: 3.45.0
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC
@@ -29,7 +29,6 @@ Requires-Dist: proto-plus<2.0.0dev,>=1.22.0
 Requires-Dist: sqlparse>=0.4.4
 Requires-Dist: proto-plus<2.0.0dev,>=1.22.2; python_version >= "3.11"
 Requires-Dist: protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<5.0.0dev,>=3.19.5
-Requires-Dist: deprecated>=1.2.14
 Requires-Dist: grpc-interceptor>=0.15.4
 Provides-Extra: tracing
 Requires-Dist: opentelemetry-api>=1.1.0; extra == "tracing"

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_admin_database_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.43.0"  # {x-release-please-version}
+__version__ = "3.45.0"  # {x-release-please-version}

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_admin_instance_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.43.0"  # {x-release-please-version}
+__version__ = "3.45.0"  # {x-release-please-version}

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_dbapi/_helpers.py

@@ -24,7 +24,7 @@ WHERE table_catalog = '' AND table_schema = @table_schema
 SQL_GET_TABLE_COLUMN_SCHEMA = """
 SELECT COLUMN_NAME, IS_NULLABLE, SPANNER_TYPE
 FROM INFORMATION_SCHEMA.COLUMNS
-WHERE TABLE_SCHEMA = @table_schema AND TABLE_NAME = @table_name
+WHERE TABLE_SCHEMA = @schema_name AND TABLE_NAME = @table_name
 """
 
 # This table maps spanner_types to Spanner's data type sizes as per
@@ -40,6 +40,7 @@ CODE_TO_DISPLAY_SIZE = {
     param_types.BOOL.code: 1,
     param_types.DATE.code: 4,
     param_types.FLOAT64.code: 8,
+    param_types.FLOAT32.code: 4,
     param_types.INT64.code: 8,
     param_types.TIMESTAMP.code: 12,
 }

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_dbapi/connection.py

@@ -31,7 +31,6 @@ from google.cloud.spanner_dbapi.transaction_helper import TransactionRetryHelper
 from google.cloud.spanner_dbapi.cursor import Cursor
 from google.cloud.spanner_v1 import RequestOptions
 from google.cloud.spanner_v1.snapshot import Snapshot
-from deprecated import deprecated
 
 from google.cloud.spanner_dbapi.exceptions import (
     InterfaceError,
@@ -187,10 +186,11 @@ class Connection:
         return self._autocommit_dml_mode
 
     @property
-    @deprecated(
-        reason="This method is deprecated. Use _spanner_transaction_started field"
-    )
     def inside_transaction(self):
+        warnings.warn(
+            "This method is deprecated. Use _spanner_transaction_started field",
+            DeprecationWarning,
+        )
         return (
             self._transaction
             and not self._transaction.committed

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_dbapi/parse_utils.py

@@ -17,12 +17,12 @@
 import datetime
 import decimal
 import re
+import warnings
 
 import sqlparse
 from google.cloud import spanner_v1 as spanner
 from google.cloud.spanner_v1 import JsonObject
 from . import client_side_statement_parser
-from deprecated import deprecated
 
 from .exceptions import Error
 from .parsed_statement import ParsedStatement, StatementType, Statement
@@ -179,7 +179,6 @@ RE_VALUES_PYFORMAT = re.compile(
 RE_PYFORMAT = re.compile(r"(%s|%\([^\(\)]+\)s)+", re.DOTALL)
 
 
-@deprecated(reason="This method is deprecated. Use _classify_stmt method")
 def classify_stmt(query):
     """Determine SQL query type.
     :type query: str
@@ -187,6 +186,10 @@ def classify_stmt(query):
     :rtype: str
     :returns: The query type name.
     """
+    warnings.warn(
+        "This method is deprecated. Use _classify_stmt method", DeprecationWarning
+    )
+
     # sqlparse will strip Cloud Spanner comments,
     # still, special commenting styles, like
     # PostgreSQL dollar quoted comments are not

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_dbapi/types.py

@@ -73,7 +73,7 @@ Binary = b64encode
 
 STRING = "STRING"
 BINARY = _DBAPITypeObject("TYPE_CODE_UNSPECIFIED", "BYTES", "ARRAY", "STRUCT")
-NUMBER = _DBAPITypeObject("BOOL", "INT64", "FLOAT64", "NUMERIC")
+NUMBER = _DBAPITypeObject("BOOL", "INT64", "FLOAT64", "FLOAT32", "NUMERIC")
 DATETIME = _DBAPITypeObject("TIMESTAMP", "DATE")
 ROWID = "STRING"
 

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_v1/_helpers.py

@@ -24,7 +24,6 @@ from google.protobuf.struct_pb2 import Value
 
 from google.api_core import datetime_helpers
 from google.cloud._helpers import _date_from_iso8601_date
-from google.cloud._helpers import _datetime_to_rfc3339
 from google.cloud.spanner_v1 import TypeCode
 from google.cloud.spanner_v1 import ExecuteSqlRequest
 from google.cloud.spanner_v1 import JsonObject
@@ -122,6 +121,40 @@ def _assert_numeric_precision_and_scale(value):
         raise ValueError(NUMERIC_MAX_PRECISION_ERR_MSG.format(precision + scale))
 
 
+def _datetime_to_rfc3339(value):
+    """Format the provided datatime in the RFC 3339 format.
+
+    :type value: datetime.datetime
+    :param value: value to format
+
+    :rtype: str
+    :returns: RFC 3339 formatted datetime string
+    """
+    # Convert to UTC and then drop the timezone so we can append "Z" in lieu of
+    # allowing isoformat to append the "+00:00" zone offset.
+    value = value.astimezone(datetime.timezone.utc).replace(tzinfo=None)
+    return value.isoformat(sep="T", timespec="microseconds") + "Z"
+
+
+def _datetime_to_rfc3339_nanoseconds(value):
+    """Format the provided datatime in the RFC 3339 format.
+
+    :type value: datetime_helpers.DatetimeWithNanoseconds
+    :param value: value to format
+
+    :rtype: str
+    :returns: RFC 3339 formatted datetime string
+    """
+
+    if value.nanosecond == 0:
+        return _datetime_to_rfc3339(value)
+    nanos = str(value.nanosecond).rjust(9, "0").rstrip("0")
+    # Convert to UTC and then drop the timezone so we can append "Z" in lieu of
+    # allowing isoformat to append the "+00:00" zone offset.
+    value = value.astimezone(datetime.timezone.utc).replace(tzinfo=None)
+    return "{}.{}Z".format(value.isoformat(sep="T", timespec="seconds"), nanos)
+
+
 def _make_value_pb(value):
     """Helper for :func:`_make_list_value_pbs`.
 
@@ -150,9 +183,9 @@ def _make_value_pb(value):
                 return Value(string_value="-Infinity")
         return Value(number_value=value)
     if isinstance(value, datetime_helpers.DatetimeWithNanoseconds):
-        return Value(string_value=value.rfc3339())
+        return Value(string_value=_datetime_to_rfc3339_nanoseconds(value))
     if isinstance(value, datetime.datetime):
-        return Value(string_value=_datetime_to_rfc3339(value, ignore_zone=False))
+        return Value(string_value=_datetime_to_rfc3339(value))
     if isinstance(value, datetime.date):
         return Value(string_value=value.isoformat())
     if isinstance(value, bytes):
@@ -228,6 +261,11 @@ def _parse_value_pb(value_pb, field_type):
             return float(value_pb.string_value)
         else:
             return value_pb.number_value
+    elif type_code == TypeCode.FLOAT32:
+        if value_pb.HasField("string_value"):
+            return float(value_pb.string_value)
+        else:
+            return value_pb.number_value
     elif type_code == TypeCode.DATE:
         return _date_from_iso8601_date(value_pb.string_value)
     elif type_code == TypeCode.TIMESTAMP:

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.43.0"  # {x-release-please-version}
+__version__ = "3.45.0"  # {x-release-please-version}

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_v1/param_types.py

@@ -26,12 +26,14 @@ BYTES = Type(code=TypeCode.BYTES)
 BOOL = Type(code=TypeCode.BOOL)
 INT64 = Type(code=TypeCode.INT64)
 FLOAT64 = Type(code=TypeCode.FLOAT64)
+FLOAT32 = Type(code=TypeCode.FLOAT32)
 DATE = Type(code=TypeCode.DATE)
 TIMESTAMP = Type(code=TypeCode.TIMESTAMP)
 NUMERIC = Type(code=TypeCode.NUMERIC)
 JSON = Type(code=TypeCode.JSON)
 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)
 
 
 def Array(element_type):

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google/cloud/spanner_v1/streamed.py

@@ -332,6 +332,7 @@ _MERGE_BY_TYPE = {
     TypeCode.BYTES: _merge_string,
     TypeCode.DATE: _merge_string,
     TypeCode.FLOAT64: _merge_float64,
+    TypeCode.FLOAT32: _merge_float64,
     TypeCode.INT64: _merge_string,
     TypeCode.STRING: _merge_string,
     TypeCode.STRUCT: _merge_struct,

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0/google_cloud_spanner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-cloud-spanner
-Version: 3.43.0
+Version: 3.45.0
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC
@@ -29,7 +29,6 @@ Requires-Dist: proto-plus<2.0.0dev,>=1.22.0
 Requires-Dist: sqlparse>=0.4.4
 Requires-Dist: proto-plus<2.0.0dev,>=1.22.2; python_version >= "3.11"
 Requires-Dist: protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<5.0.0dev,>=3.19.5
-Requires-Dist: deprecated>=1.2.14
 Requires-Dist: grpc-interceptor>=0.15.4
 Provides-Extra: tracing
 Requires-Dist: opentelemetry-api>=1.1.0; extra == "tracing"

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/google_cloud_spanner.egg-info/requires.txt

@@ -4,7 +4,6 @@ grpc-google-iam-v1<1.0.0dev,>=0.12.4
 proto-plus<2.0.0dev,>=1.22.0
 sqlparse>=0.4.4
 protobuf!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5,<5.0.0dev,>=3.19.5
-deprecated>=1.2.14
 grpc-interceptor>=0.15.4
 
 [:python_version >= "3.11"]

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/setup.py

@@ -43,7 +43,6 @@ dependencies = [
     "sqlparse >= 0.4.4",
     "proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
     "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
-    "deprecated >= 1.2.14",
     "grpc-interceptor >= 0.15.4",
 ]
 extras = {

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/tests/system/_sample_data.py

@@ -90,5 +90,8 @@ def _check_cell_data(found_cell, expected_cell, recurse_into_lists=True):
         for found_item, expected_item in zip(found_cell, expected_cell):
             _check_cell_data(found_item, expected_item)
 
+    elif isinstance(found_cell, float) and not math.isinf(found_cell):
+        assert abs(found_cell - expected_cell) < 0.00001
+
     else:
         assert found_cell == expected_cell

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/tests/system/test_session_api.py

@@ -2216,6 +2216,47 @@ def test_execute_sql_w_float_bindings_transfinite(sessions_database, database_di
     )
 
 
+def test_execute_sql_w_float32_bindings(sessions_database, database_dialect):
+    pytest.skip("float32 is not yet supported in production.")
+    _bind_test_helper(
+        sessions_database,
+        database_dialect,
+        spanner_v1.param_types.FLOAT32,
+        42.3,
+        [12.3, 456.0, 7.89],
+    )
+
+
+def test_execute_sql_w_float32_bindings_transfinite(
+    sessions_database, database_dialect
+):
+    pytest.skip("float32 is not yet supported in production.")
+    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "neg_inf"
+    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
+
+    # Find -inf
+    _check_sql_results(
+        sessions_database,
+        sql=f"SELECT {placeholder}",
+        params={key: NEG_INF},
+        param_types={key: spanner_v1.param_types.FLOAT32},
+        expected=[(NEG_INF,)],
+        order=False,
+    )
+
+    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "pos_inf"
+    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
+    # Find +inf
+    _check_sql_results(
+        sessions_database,
+        sql=f"SELECT {placeholder}",
+        params={key: POS_INF},
+        param_types={key: spanner_v1.param_types.FLOAT32},
+        expected=[(POS_INF,)],
+        order=False,
+    )
+
+
 def test_execute_sql_w_bytes_bindings(sessions_database, database_dialect):
     _bind_test_helper(
         sessions_database,
@@ -2307,6 +2348,18 @@ def test_execute_sql_w_jsonb_bindings(
     )
 
 
+def test_execute_sql_w_oid_bindings(
+    not_emulator, not_google_standard_sql, sessions_database, database_dialect
+):
+    _bind_test_helper(
+        sessions_database,
+        database_dialect,
+        spanner_v1.param_types.PG_OID,
+        123,
+        [123, 456],
+    )
+
+
 def test_execute_sql_w_query_param_struct(sessions_database, not_postgres):
     name = "Phred"
     count = 123

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/tests/unit/test__helpers.py

@@ -190,6 +190,15 @@ class Test_make_value_pb(unittest.TestCase):
         self.assertIsInstance(value_pb, Value)
         self.assertEqual(value_pb.string_value, today.isoformat())
 
+    def test_w_date_pre1000ad(self):
+        import datetime
+        from google.protobuf.struct_pb2 import Value
+
+        when = datetime.date(800, 2, 25)
+        value_pb = self._callFUT(when)
+        self.assertIsInstance(value_pb, Value)
+        self.assertEqual(value_pb.string_value, "0800-02-25")
+
     def test_w_timestamp_w_nanos(self):
         import datetime
         from google.protobuf.struct_pb2 import Value
@@ -200,7 +209,19 @@ class Test_make_value_pb(unittest.TestCase):
         )
         value_pb = self._callFUT(when)
         self.assertIsInstance(value_pb, Value)
-        self.assertEqual(value_pb.string_value, when.rfc3339())
+        self.assertEqual(value_pb.string_value, "2016-12-20T21:13:47.123456789Z")
+
+    def test_w_timestamp_w_nanos_pre1000ad(self):
+        import datetime
+        from google.protobuf.struct_pb2 import Value
+        from google.api_core import datetime_helpers
+
+        when = datetime_helpers.DatetimeWithNanoseconds(
+            850, 12, 20, 21, 13, 47, nanosecond=123456789, tzinfo=datetime.timezone.utc
+        )
+        value_pb = self._callFUT(when)
+        self.assertIsInstance(value_pb, Value)
+        self.assertEqual(value_pb.string_value, "0850-12-20T21:13:47.123456789Z")
 
     def test_w_listvalue(self):
         from google.protobuf.struct_pb2 import Value
@@ -214,12 +235,20 @@ class Test_make_value_pb(unittest.TestCase):
     def test_w_datetime(self):
         import datetime
         from google.protobuf.struct_pb2 import Value
-        from google.api_core import datetime_helpers
 
-        now = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc)
-        value_pb = self._callFUT(now)
+        when = datetime.datetime(2021, 2, 8, 0, 0, 0, tzinfo=datetime.timezone.utc)
+        value_pb = self._callFUT(when)
+        self.assertIsInstance(value_pb, Value)
+        self.assertEqual(value_pb.string_value, "2021-02-08T00:00:00.000000Z")
+
+    def test_w_datetime_pre1000ad(self):
+        import datetime
+        from google.protobuf.struct_pb2 import Value
+
+        when = datetime.datetime(916, 2, 8, 0, 0, 0, tzinfo=datetime.timezone.utc)
+        value_pb = self._callFUT(when)
         self.assertIsInstance(value_pb, Value)
-        self.assertEqual(value_pb.string_value, datetime_helpers.to_rfc3339(now))
+        self.assertEqual(value_pb.string_value, "0916-02-08T00:00:00.000000Z")
 
     def test_w_timestamp_w_tz(self):
         import datetime
@@ -231,6 +260,16 @@ class Test_make_value_pb(unittest.TestCase):
         self.assertIsInstance(value_pb, Value)
         self.assertEqual(value_pb.string_value, "2021-02-07T23:00:00.000000Z")
 
+    def test_w_timestamp_w_tz_pre1000ad(self):
+        import datetime
+        from google.protobuf.struct_pb2 import Value
+
+        zone = datetime.timezone(datetime.timedelta(hours=+1), name="CET")
+        when = datetime.datetime(721, 2, 8, 0, 0, 0, tzinfo=zone)
+        value_pb = self._callFUT(when)
+        self.assertIsInstance(value_pb, Value)
+        self.assertEqual(value_pb.string_value, "0721-02-07T23:00:00.000000Z")
+
     def test_w_unknown_type(self):
         with self.assertRaises(ValueError):
             self._callFUT(object())
@@ -466,6 +505,27 @@ class Test_parse_value_pb(unittest.TestCase):
 
         self.assertEqual(self._callFUT(value_pb, field_type), expected_value)
 
+    def test_w_float32(self):
+        from google.cloud.spanner_v1 import Type, TypeCode
+        from google.protobuf.struct_pb2 import Value
+
+        VALUE = 3.14159
+        field_type = Type(code=TypeCode.FLOAT32)
+        value_pb = Value(number_value=VALUE)
+
+        self.assertEqual(self._callFUT(value_pb, field_type), VALUE)
+
+    def test_w_float32_str(self):
+        from google.cloud.spanner_v1 import Type, TypeCode
+        from google.protobuf.struct_pb2 import Value
+
+        VALUE = "3.14159"
+        field_type = Type(code=TypeCode.FLOAT32)
+        value_pb = Value(string_value=VALUE)
+        expected_value = 3.14159
+
+        self.assertEqual(self._callFUT(value_pb, field_type), expected_value)
+
     def test_w_date(self):
         import datetime
         from google.protobuf.struct_pb2 import Value

{google-cloud-spanner-3.43.0 → google-cloud-spanner-3.45.0}/tests/unit/test_param_types.py

@@ -18,9 +18,7 @@ import unittest
 
 class Test_ArrayParamType(unittest.TestCase):
     def test_it(self):
-        from google.cloud.spanner_v1 import Type
-        from google.cloud.spanner_v1 import TypeCode
-        from google.cloud.spanner_v1 import param_types
+        from google.cloud.spanner_v1 import Type, TypeCode, param_types
 
         expected = Type(
             code=TypeCode.ARRAY, array_element_type=Type(code=TypeCode.INT64)
@@ -33,15 +31,13 @@ class Test_ArrayParamType(unittest.TestCase):
 
 class Test_Struct(unittest.TestCase):
     def test_it(self):
-        from google.cloud.spanner_v1 import Type
-        from google.cloud.spanner_v1 import TypeCode
-        from google.cloud.spanner_v1 import StructType
-        from google.cloud.spanner_v1 import param_types
+        from google.cloud.spanner_v1 import StructType, Type, TypeCode, param_types
 
         struct_type = StructType(
             fields=[
                 StructType.Field(name="name", type_=Type(code=TypeCode.STRING)),
                 StructType.Field(name="count", type_=Type(code=TypeCode.INT64)),
+                StructType.Field(name="float32", type_=Type(code=TypeCode.FLOAT32)),
             ]
         )
         expected = Type(code=TypeCode.STRUCT, struct_type=struct_type)
@@ -50,6 +46,7 @@ class Test_Struct(unittest.TestCase):
             [
                 param_types.StructField("name", param_types.STRING),
                 param_types.StructField("count", param_types.INT64),
+                param_types.StructField("float32", param_types.FLOAT32),
             ]
         )
 
@@ -57,6 +54,25 @@ class Test_Struct(unittest.TestCase):
 
 
 class Test_JsonbParamType(unittest.TestCase):
+    def test_it(self):
+        from google.cloud.spanner_v1 import (
+            Type,
+            TypeAnnotationCode,
+            TypeCode,
+            param_types,
+        )
+
+        expected = Type(
+            code=TypeCode.JSON,
+            type_annotation=TypeAnnotationCode(TypeAnnotationCode.PG_JSONB),
+        )
+
+        found = param_types.PG_JSONB
+
+        self.assertEqual(found, expected)
+
+
+class Test_OidParamType(unittest.TestCase):
     def test_it(self):
         from google.cloud.spanner_v1 import Type
         from google.cloud.spanner_v1 import TypeCode
@@ -64,10 +80,10 @@ class Test_JsonbParamType(unittest.TestCase):
         from google.cloud.spanner_v1 import param_types
 
         expected = Type(
-            code=TypeCode.JSON,
-            type_annotation=TypeAnnotationCode(TypeAnnotationCode.PG_JSONB),
+            code=TypeCode.INT64,
+            type_annotation=TypeAnnotationCode.PG_OID,
         )
 
-        found = param_types.PG_JSONB
+        found = param_types.PG_OID
 
         self.assertEqual(found, expected)