Merge branch 'main' into main

Author: sgorse123

.github/workflows/mock_server_tests.yaml

@@ -5,7 +5,7 @@ on:
   pull_request:
 name: Run Spanner tests against an in-mem mock server
 jobs:
-  system-tests:
+  mock-server-tests:
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/presubmit.yaml

@@ -0,0 +1,42 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+name: Presubmit checks
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.8
+      - name: Install nox
+        run: python -m pip install nox
+      - name: Check formatting
+        run: nox -s lint
+  units:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{matrix.python}}
+      - name: Install nox
+        run: python -m pip install nox
+      - name: Run unit tests
+        run: nox -s unit-${{matrix.python}}

.kokoro/presubmit/presubmit.cfg

@@ -1,7 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Disable system tests.
+# Only run a subset of all nox sessions
 env_vars: {
-    key: "RUN_SYSTEM_TESTS"
-    value: "false"
+    key: "NOX_SESSION"
+    value: "unit-3.8 unit-3.12 cover docs docfx"
 }

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "3.53.0"
+    ".": "3.54.0"
 }

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 [1]: https://pypi.org/project/google-cloud-spanner/#history
 
+## [3.54.0](https://github.com/googleapis/python-spanner/compare/v3.53.0...v3.54.0) (2025-04-28)
+
+
+### Features
+
+* Add interval type support ([#1340](https://github.com/googleapis/python-spanner/issues/1340)) ([6ca9b43](https://github.com/googleapis/python-spanner/commit/6ca9b43c3038eca1317c7c9b7e3543b5f1bc68ad))
+* Add sample for pre-split feature ([#1333](https://github.com/googleapis/python-spanner/issues/1333)) ([ca76108](https://github.com/googleapis/python-spanner/commit/ca76108809174e4f3eea38d7ac2463d9b4c73304))
+* Add SQL statement for begin transaction isolation level ([#1331](https://github.com/googleapis/python-spanner/issues/1331)) ([3ac0f91](https://github.com/googleapis/python-spanner/commit/3ac0f9131b38e5cfb2b574d3d73b03736b871712))
+* Support transaction isolation level in dbapi ([#1327](https://github.com/googleapis/python-spanner/issues/1327)) ([03400c4](https://github.com/googleapis/python-spanner/commit/03400c40f1c1cc73e51733f2a28910a8dd78e7d9))
+
+
+### Bug Fixes
+
+* Improve client-side regex statement parser ([#1328](https://github.com/googleapis/python-spanner/issues/1328)) ([b3c259d](https://github.com/googleapis/python-spanner/commit/b3c259deec817812fd8e4940faacf4a927d0d69c))
+
 ## [3.53.0](https://github.com/googleapis/python-spanner/compare/v3.52.0...v3.53.0) (2025-03-12)
 
 

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.53.0"  # {x-release-please-version}
+__version__ = "3.54.0"  # {x-release-please-version}

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.53.0"  # {x-release-please-version}
+__version__ = "3.54.0"  # {x-release-please-version}

google/cloud/spanner_dbapi/connection.py

@@ -17,6 +17,8 @@
 
 from google.api_core.exceptions import Aborted
 from google.api_core.gapic_v1.client_info import ClientInfo
+from google.auth.credentials import AnonymousCredentials
+
 from google.cloud import spanner_v1 as spanner
 from google.cloud.spanner_dbapi import partition_helper
 from google.cloud.spanner_dbapi.batch_dml_executor import BatchMode, BatchDmlExecutor
@@ -784,11 +786,15 @@ def connect(
                 route_to_leader_enabled=route_to_leader_enabled,
             )
         else:
+            client_options = None
+            if isinstance(credentials, AnonymousCredentials):
+                client_options = kwargs.get("client_options")
             client = spanner.Client(
                 project=project,
                 credentials=credentials,
                 client_info=client_info,
                 route_to_leader_enabled=route_to_leader_enabled,
+                client_options=client_options,
             )
     else:
         if project is not None and client.project != project:
@@ -798,7 +804,7 @@ def connect(
     database = None
     if database_id:
         database = instance.database(database_id, pool=pool)
-    conn = Connection(instance, database)
+    conn = Connection(instance, database, **kwargs)
     if pool is not None:
         conn._own_pool = False
 

google/cloud/spanner_dbapi/transaction_helper.py

@@ -162,7 +162,7 @@ def add_execute_statement_for_retry(
         self._last_statement_details_per_cursor[cursor] = last_statement_result_details
         self._statement_result_details_list.append(last_statement_result_details)
 
-    def retry_transaction(self):
+    def retry_transaction(self, default_retry_delay=None):
         """Retry the aborted transaction.
 
         All the statements executed in the original transaction
@@ -202,7 +202,9 @@ def retry_transaction(self):
                             raise RetryAborted(RETRY_ABORTED_ERROR, ex)
                 return
             except Aborted as ex:
-                delay = _get_retry_delay(ex.errors[0], attempt)
+                delay = _get_retry_delay(
+                    ex.errors[0], attempt, default_retry_delay=default_retry_delay
+                )
                 if delay:
                     time.sleep(delay)
 

google/cloud/spanner_v1/_helpers.py

@@ -510,6 +510,7 @@ def _metadata_with_prefix(prefix, **kw):
 def _retry_on_aborted_exception(
     func,
     deadline,
+    default_retry_delay=None,
 ):
     """
     Handles retry logic for Aborted exceptions, considering the deadline.
@@ -520,7 +521,12 @@ def _retry_on_aborted_exception(
             attempts += 1
             return func()
         except Aborted as exc:
-            _delay_until_retry(exc, deadline=deadline, attempts=attempts)
+            _delay_until_retry(
+                exc,
+                deadline=deadline,
+                attempts=attempts,
+                default_retry_delay=default_retry_delay,
+            )
             continue
 
 
@@ -603,12 +609,12 @@ def _metadata_with_span_context(metadata: List[Tuple[str, str]], **kw) -> None:
     Returns:
         None
     """
-    if HAS_OPENTELEMETRY_INSTALLED:
+    if HAS_OPENTELEMETRY_INSTALLED and metadata is not None:
         metadata.append(("x-goog-spanner-end-to-end-tracing", "true"))
         inject(setter=OpenTelemetryContextSetter(), carrier=metadata)
 
 
-def _delay_until_retry(exc, deadline, attempts):
+def _delay_until_retry(exc, deadline, attempts, default_retry_delay=None):
     """Helper for :meth:`Session.run_in_transaction`.
 
     Detect retryable abort, and impose server-supplied delay.
@@ -628,15 +634,15 @@ def _delay_until_retry(exc, deadline, attempts):
     if now >= deadline:
         raise
 
-    delay = _get_retry_delay(cause, attempts)
+    delay = _get_retry_delay(cause, attempts, default_retry_delay=default_retry_delay)
     if delay is not None:
         if now + delay > deadline:
             raise
 
         time.sleep(delay)
 
 
-def _get_retry_delay(cause, attempts):
+def _get_retry_delay(cause, attempts, default_retry_delay=None):
     """Helper for :func:`_delay_until_retry`.
 
     :type exc: :class:`grpc.Call`
@@ -658,6 +664,8 @@ def _get_retry_delay(cause, attempts):
         retry_info.ParseFromString(retry_info_pb)
         nanos = retry_info.retry_delay.nanos
         return retry_info.retry_delay.seconds + nanos / 1.0e9
+    if default_retry_delay is not None:
+        return default_retry_delay
 
     return 2**attempts + random.random()
 
@@ -699,6 +707,10 @@ def __radd__(self, n):
         """
         return self.__add__(n)
 
+    def reset(self):
+        with self.__lock:
+            self.__value = 0
+
 
 def _metadata_with_request_id(*args, **kwargs):
     return with_request_id(*args, **kwargs)