Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

Commit af6bb56

Browse files
rahul2393rahul2393
committed
fix build
1 parent 14f18f3 commit af6bb56

File tree

4 files changed

+6
-47
lines changed

4 files changed

+6
-47
lines changed

‎google/cloud/spanner_v1/_helpers.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ def parse_num(s: str, suffix: str) -> int:
343343

344344
return cls(months=total_months, days=days, nanos=nanos)
345345

346+
346347
def _make_value_pb(value):
347348
"""Helper for :func:`_make_list_value_pbs`.
348349

‎tests/system/test_session_api.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2912,9 +2912,9 @@ def _check_batch_status(status_code, expected=code_pb2.OK):
29122912
def get_param_info(param_names, database_dialect):
29132913
keys = [f"p{i + 1}" for i in range(len(param_names))]
29142914
if database_dialect == DatabaseDialect.POSTGRESQL:
2915-
placeholders = [f"${i+1}" for i in range(len(param_names))]
2915+
placeholders = [f"${i + 1}" for i in range(len(param_names))]
29162916
else:
2917-
placeholders = [f"@p{i+1}" for i in range(len(param_names))]
2917+
placeholders = [f"@p{i + 1}" for i in range(len(param_names))]
29182918
return keys, placeholders
29192919

29202920

@@ -2996,10 +2996,9 @@ def test_computed_columns(transaction):
29962996
results = list(
29972997
transaction.execute_sql(
29982998
f"""
2999-
SELECT expiry_within_month, interval_array_len
3000-
FROM IntervalTable
3001-
WHERE key = {placeholders[0]}
3002-
""",
2999+
SELECT expiry_within_month, interval_array_len
3000+
FROM IntervalTable
3001+
WHERE key = {placeholders[0]}""",
30033002
params={keys[0]: "test1"},
30043003
param_types={keys[0]: spanner_v1.param_types.STRING},
30053004
)
@@ -3078,7 +3077,6 @@ def test_interval_array_param(transaction):
30783077

30793078
assert intervals[3] is None
30803079

3081-
30823080
def test_interval_array_cast(transaction):
30833081
results = list(
30843082
transaction.execute_sql(

‎tests/unit/test__helpers.py‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,156 +1046,117 @@ def _callFUT(self, *args, **kw):
10461046

10471047
def test_basic_interval(self):
10481048
from google.protobuf.struct_pb2 import Value
1049-
from google.cloud.spanner_v1 import Type
1050-
from google.cloud.spanner_v1 import TypeCode
10511049
from google.cloud.spanner_v1._helpers import Interval
10521050

10531051
interval = Interval(months=14, days=3, nanos=43926789000123)
1054-
field_type = Type(code=TypeCode.INTERVAL)
10551052
value_pb = self._callFUT(interval)
10561053
self.assertIsInstance(value_pb, Value)
10571054
self.assertEqual(value_pb.string_value, "P1Y2M3DT12H12M6.789000123S")
10581055

10591056
def test_months_only(self):
10601057
from google.protobuf.struct_pb2 import Value
1061-
from google.cloud.spanner_v1 import Type
1062-
from google.cloud.spanner_v1 import TypeCode
10631058
from google.cloud.spanner_v1._helpers import Interval
10641059

10651060
interval = Interval(months=10, days=0, nanos=0)
1066-
field_type = Type(code=TypeCode.INTERVAL)
10671061
value_pb = self._callFUT(interval)
10681062
self.assertIsInstance(value_pb, Value)
10691063
self.assertEqual(value_pb.string_value, "P10M")
10701064

10711065
def test_days_only(self):
10721066
from google.protobuf.struct_pb2 import Value
1073-
from google.cloud.spanner_v1 import Type
1074-
from google.cloud.spanner_v1 import TypeCode
10751067
from google.cloud.spanner_v1._helpers import Interval
10761068

10771069
interval = Interval(months=0, days=10, nanos=0)
1078-
field_type = Type(code=TypeCode.INTERVAL)
10791070
value_pb = self._callFUT(interval)
10801071
self.assertIsInstance(value_pb, Value)
10811072
self.assertEqual(value_pb.string_value, "P10D")
10821073

10831074
def test_seconds_only(self):
10841075
from google.protobuf.struct_pb2 import Value
1085-
from google.cloud.spanner_v1 import Type
1086-
from google.cloud.spanner_v1 import TypeCode
10871076
from google.cloud.spanner_v1._helpers import Interval
10881077

10891078
interval = Interval(months=0, days=0, nanos=10000000000)
1090-
field_type = Type(code=TypeCode.INTERVAL)
10911079
value_pb = self._callFUT(interval)
10921080
self.assertIsInstance(value_pb, Value)
10931081
self.assertEqual(value_pb.string_value, "PT10S")
10941082

10951083
def test_milliseconds_only(self):
10961084
from google.protobuf.struct_pb2 import Value
1097-
from google.cloud.spanner_v1 import Type
1098-
from google.cloud.spanner_v1 import TypeCode
10991085
from google.cloud.spanner_v1._helpers import Interval
11001086

11011087
interval = Interval(months=0, days=0, nanos=10000000)
1102-
field_type = Type(code=TypeCode.INTERVAL)
11031088
value_pb = self._callFUT(interval)
11041089
self.assertIsInstance(value_pb, Value)
11051090
self.assertEqual(value_pb.string_value, "PT0.010S")
11061091

11071092
def test_microseconds_only(self):
11081093
from google.protobuf.struct_pb2 import Value
1109-
from google.cloud.spanner_v1 import Type
1110-
from google.cloud.spanner_v1 import TypeCode
11111094
from google.cloud.spanner_v1._helpers import Interval
11121095

11131096
interval = Interval(months=0, days=0, nanos=10000)
1114-
field_type = Type(code=TypeCode.INTERVAL)
11151097
value_pb = self._callFUT(interval)
11161098
self.assertIsInstance(value_pb, Value)
11171099
self.assertEqual(value_pb.string_value, "PT0.000010S")
11181100

11191101
def test_nanoseconds_only(self):
11201102
from google.protobuf.struct_pb2 import Value
1121-
from google.cloud.spanner_v1 import Type
1122-
from google.cloud.spanner_v1 import TypeCode
11231103
from google.cloud.spanner_v1._helpers import Interval
11241104

11251105
interval = Interval(months=0, days=0, nanos=10)
1126-
field_type = Type(code=TypeCode.INTERVAL)
11271106
value_pb = self._callFUT(interval)
11281107
self.assertIsInstance(value_pb, Value)
11291108
self.assertEqual(value_pb.string_value, "PT0.000000010S")
11301109

11311110
def test_mixed_components(self):
11321111
from google.protobuf.struct_pb2 import Value
1133-
from google.cloud.spanner_v1 import Type
1134-
from google.cloud.spanner_v1 import TypeCode
11351112
from google.cloud.spanner_v1._helpers import Interval
11361113

11371114
interval = Interval(months=10, days=20, nanos=1030)
1138-
field_type = Type(code=TypeCode.INTERVAL)
11391115
value_pb = self._callFUT(interval)
11401116
self.assertIsInstance(value_pb, Value)
11411117
self.assertEqual(value_pb.string_value, "P10M20DT0.000001030S")
11421118

11431119
def test_mixed_components_with_negative_nanos(self):
11441120
from google.protobuf.struct_pb2 import Value
1145-
from google.cloud.spanner_v1 import Type
1146-
from google.cloud.spanner_v1 import TypeCode
11471121
from google.cloud.spanner_v1._helpers import Interval
11481122

11491123
interval = Interval(months=10, days=20, nanos=-1030)
1150-
field_type = Type(code=TypeCode.INTERVAL)
11511124
value_pb = self._callFUT(interval)
11521125
self.assertIsInstance(value_pb, Value)
11531126
self.assertEqual(value_pb.string_value, "P10M20DT-0.000001030S")
11541127

11551128
def test_negative_interval(self):
11561129
from google.protobuf.struct_pb2 import Value
1157-
from google.cloud.spanner_v1 import Type
1158-
from google.cloud.spanner_v1 import TypeCode
11591130
from google.cloud.spanner_v1._helpers import Interval
11601131

11611132
interval = Interval(months=-14, days=-3, nanos=-43926789000123)
1162-
field_type = Type(code=TypeCode.INTERVAL)
11631133
value_pb = self._callFUT(interval)
11641134
self.assertIsInstance(value_pb, Value)
11651135
self.assertEqual(value_pb.string_value, "P-1Y-2M-3DT-12H-12M-6.789000123S")
11661136

11671137
def test_mixed_signs(self):
11681138
from google.protobuf.struct_pb2 import Value
1169-
from google.cloud.spanner_v1 import Type
1170-
from google.cloud.spanner_v1 import TypeCode
11711139
from google.cloud.spanner_v1._helpers import Interval
11721140

11731141
interval = Interval(months=10, days=3, nanos=-41401234000000)
1174-
field_type = Type(code=TypeCode.INTERVAL)
11751142
value_pb = self._callFUT(interval)
11761143
self.assertIsInstance(value_pb, Value)
11771144
self.assertEqual(value_pb.string_value, "P10M3DT-11H-30M-1.234S")
11781145

11791146
def test_large_values(self):
11801147
from google.protobuf.struct_pb2 import Value
1181-
from google.cloud.spanner_v1 import Type
1182-
from google.cloud.spanner_v1 import TypeCode
11831148
from google.cloud.spanner_v1._helpers import Interval
11841149

11851150
interval = Interval(months=25, days=15, nanos=316223999999999999999)
1186-
field_type = Type(code=TypeCode.INTERVAL)
11871151
value_pb = self._callFUT(interval)
11881152
self.assertIsInstance(value_pb, Value)
11891153
self.assertEqual(value_pb.string_value, "P2Y1M15DT87839999H59M59.999999999S")
11901154

11911155
def test_zero_interval(self):
11921156
from google.protobuf.struct_pb2 import Value
1193-
from google.cloud.spanner_v1 import Type
1194-
from google.cloud.spanner_v1 import TypeCode
11951157
from google.cloud.spanner_v1._helpers import Interval
11961158

11971159
interval = Interval(months=0, days=0, nanos=0)
1198-
field_type = Type(code=TypeCode.INTERVAL)
11991160
value_pb = self._callFUT(interval)
12001161
self.assertIsInstance(value_pb, Value)
12011162
self.assertEqual(value_pb.string_value, "P0Y")

‎tests/unit/test_metrics.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ def mocked_call(*args, **kwargs):
6565
return _UnaryOutcome(MagicMock(), MagicMock())
6666

6767
def intercept_wrapper(invoked_method, request_or_iterator, call_details):
68-
nonlocal original_intercept
6968
nonlocal first_attempt
7069
invoked_method = mocked_call
7170
if first_attempt:

0 commit comments

Comments
 (0)