fix test

Author: rahul2393

google/cloud/spanner_v1/_helpers.py

@@ -343,23 +343,6 @@ def parse_num(s: str, suffix: str) -> int:
 
         return cls(months=total_months, days=days, nanos=nanos)
 
-
-@dataclass
-class NullInterval:
-    """Represents a Spanner INTERVAL that may be NULL."""
-
-    interval: Interval
-    valid: bool = True
-
-    def is_null(self) -> bool:
-        return not self.valid
-
-    def __str__(self) -> str:
-        if not self.valid:
-            return "NULL"
-        return str(self.interval)
-
-
 def _make_value_pb(value):
     """Helper for :func:`_make_list_value_pbs`.
 
@@ -417,10 +400,6 @@ def _make_value_pb(value):
             return Value(string_value=base64.b64encode(value))
     if isinstance(value, Interval):
         return Value(string_value=str(value))
-    if isinstance(value, NullInterval):
-        if value.is_null():
-            return Value(null_value="NULL_VALUE")
-        return Value(string_value=str(value.interval))
 
     raise ValueError("Unknown type: %s" % (value,))
 

tests/system/test_session_api.py

@@ -2955,7 +2955,7 @@ def insert_test1(transaction):
         keys, placeholders = get_param_info(
             ["key", "create_time", "expiry_time"], database_dialect
         )
-        transaction.execute_sql(
+        transaction.execute_update(
             f"""
             INSERT INTO IntervalTable (key, create_time, expiry_time)
             VALUES ({placeholders[0]}, {placeholders[1]}, {placeholders[2]})
@@ -2972,6 +2972,25 @@ def insert_test1(transaction):
             },
         )
 
+    def insert_test2(transaction):
+        keys, placeholders = get_param_info(["key", "create_time", "expiry_time"], database_dialect)
+        transaction.execute_update(
+            f"""
+            INSERT INTO IntervalTable (key, create_time, expiry_time)
+            VALUES ({placeholders[0]}, {placeholders[1]}, {placeholders[2]})
+            """,
+            params={
+                keys[0]: "test2",
+                keys[1]: datetime.datetime(2004, 8, 30, 4, 53, 54, tzinfo=UTC),
+                keys[2]: datetime.datetime(2004, 12, 15, 4, 53, 54, tzinfo=UTC),
+            },
+            param_types={
+                keys[0]: spanner_v1.param_types.STRING,
+                keys[1]: spanner_v1.param_types.TIMESTAMP,
+                keys[2]: spanner_v1.param_types.TIMESTAMP,
+            },
+        )
+
     def test_computed_columns(transaction):
         keys, placeholders = get_param_info(["key"], database_dialect)
         results = list(
@@ -3003,34 +3022,13 @@ def test_interval_arithmetic(transaction):
         assert interval.days == 1
         assert interval.nanos == 0
 
-    def insert_test2(transaction):
-        keys, placeholders = get_param_info(
-            ["key", "create_time", "expiry_time"], database_dialect
-        )
-        transaction.execute_sql(
-            f"""
-            INSERT INTO IntervalTable (key, create_time, expiry_time)
-            VALUES ({placeholders[0]}, {placeholders[1]}, {placeholders[2]})
-            """,
-            params={
-                keys[0]: "test2",
-                keys[1]: datetime.datetime(2004, 8, 30, 4, 53, 54, tzinfo=UTC),
-                keys[2]: datetime.datetime(2004, 12, 15, 4, 53, 54, tzinfo=UTC),
-            },
-            param_types={
-                keys[0]: spanner_v1.param_types.STRING,
-                keys[1]: spanner_v1.param_types.TIMESTAMP,
-                keys[2]: spanner_v1.param_types.TIMESTAMP,
-            },
-        )
-
     def test_interval_timestamp_comparison(transaction):
         timestamp = "2004-11-30T10:23:54+0530"
         keys, placeholders = get_param_info(["interval"], database_dialect)
         if database_dialect == DatabaseDialect.POSTGRESQL:
-            query = f"SELECT COUNT(*) FROM IntervalTable WHERE create_time < TIMESTAMPTZ %s - {placeholders[0]}"
+            query = f"SELECT COUNT(*) FROM IntervalTable WHERE create_time < TIMESTAMPTZ '%s' - {placeholders[0]}"
         else:
-            query = f"SELECT COUNT(*) FROM IntervalTable WHERE create_time < TIMESTAMP(%s) - {placeholders[0]}"
+            query = f"SELECT COUNT(*) FROM IntervalTable WHERE create_time < TIMESTAMP('%s') - {placeholders[0]}"
 
         results = list(
             transaction.execute_sql(
@@ -3042,7 +3040,7 @@ def test_interval_timestamp_comparison(transaction):
         assert len(results) == 1
         assert results[0][0] == 1
 
-    def test_interval_array_param(transaction, database_dialect):
+    def test_interval_array_param(transaction):
         intervals = [
             Interval(months=14, days=3, nanos=14706000000000),
             Interval(),
@@ -3066,26 +3064,21 @@ def test_interval_array_param(transaction, database_dialect):
         intervals = row[0]
         assert len(intervals) == 4
 
-        # Check first interval
-        assert intervals[0].valid is True
-        assert intervals[0].interval.months == 14
-        assert intervals[0].interval.days == 3
-        assert intervals[0].interval.nanos == 14706000000000
+        assert intervals[0].months == 14
+        assert intervals[0].days == 3
+        assert intervals[0].nanos == 14706000000000
 
-        assert intervals[1].valid is True
-        assert intervals[1].interval.months == 0
-        assert intervals[1].interval.days == 0
-        assert intervals[1].interval.nanos == 0
+        assert intervals[1].months == 0
+        assert intervals[1].days == 0
+        assert intervals[1].nanos == 0
 
-        assert intervals[2].valid is True
-        assert intervals[2].interval.months == -14
-        assert intervals[2].interval.days == -3
-        assert intervals[2].interval.nanos == -14706000000000
+        assert intervals[2].months == -14
+        assert intervals[2].days == -3
+        assert intervals[2].nanos == -14706000000000
 
-        assert intervals[3].valid is True
-        assert intervals[3].interval.months == 0
-        assert intervals[3].interval.days == 0
-        assert intervals[3].interval.nanos == 0
+        assert intervals[3].months == 0
+        assert intervals[3].days == 0
+        assert intervals[3].nanos == 0
 
     def test_interval_array_cast(transaction):
         results = list(
@@ -3104,17 +3097,15 @@ def test_interval_array_cast(transaction):
         intervals = row[0]
         assert len(intervals) == 3
 
-        assert intervals[0].valid is True
-        assert intervals[0].interval.months == 14  # 1 year + 2 months
-        assert intervals[0].interval.days == 3
-        assert intervals[0].interval.nanos == 14706789123000  # 4h5m6.789123s in nanos
+        assert intervals[0].months == 14  # 1 year + 2 months
+        assert intervals[0].days == 3
+        assert intervals[0].nanos == 14706789123000  # 4h5m6.789123s in nanos
 
-        assert intervals[1].valid is False
+        assert intervals[1] is None
 
-        assert intervals[2].valid is True
-        assert intervals[2].interval.months == -14
-        assert intervals[2].interval.days == -3
-        assert intervals[2].interval.nanos == -14706789123000
+        assert intervals[2].months == -14
+        assert intervals[2].days == -3
+        assert intervals[2].nanos == -14706789123000
 
     setup_table()
     sessions_database.run_in_transaction(insert_test1)

tests/unit/test__helpers.py

@@ -1200,18 +1200,6 @@ def test_zero_interval(self):
         self.assertIsInstance(value_pb, Value)
         self.assertEqual(value_pb.string_value, "P0Y")
 
-    def test_null_interval(self):
-        from google.protobuf.struct_pb2 import Value
-        from google.cloud.spanner_v1 import Type
-        from google.cloud.spanner_v1 import TypeCode
-        from google.cloud.spanner_v1._helpers import NullInterval, Interval
-
-        interval = NullInterval(interval=Interval(), valid=False)
-        field_type = Type(code=TypeCode.INTERVAL)
-        value_pb = self._callFUT(interval)
-        self.assertIsInstance(value_pb, Value)
-        self.assertTrue(value_pb.HasField("null_value"))
-
 
 class Test_parse_interval(unittest.TestCase):
     def _callFUT(self, *args, **kw):