From 31e3d76188f432d48031109f4540da59480214aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Tue, 27 May 2025 14:21:01 +0200
Subject: [PATCH 1/2] feat: support database role in connect arguments

---
 samples/database_role.py             | 42 ++++++++++++++++++++++++++++
 test/mockserver_tests/test_basics.py | 19 +++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 samples/database_role.py

diff --git a/samples/database_role.py b/samples/database_role.py
new file mode 100644
index 00000000..6edd8040
--- /dev/null
+++ b/samples/database_role.py
@@ -0,0 +1,42 @@
+# Copyright 2025 Google LLC All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import uuid
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session
+
+from sample_helper import run_sample
+from model import Singer
+
+
+# Shows how to set the database role for a connection.
+def database_role_sample():
+    engine = create_engine(
+        "spanner:///projects/sample-project/"
+        "instances/sample-instance/"
+        "databases/sample-database",
+        # You can set the database role in the connect arguments.
+        connect_args={"database_role": "my_role"},
+        echo=True,
+    )
+    with Session(engine) as session:
+        singer_id = str(uuid.uuid4())
+        singer = Singer(id=singer_id, first_name="John", last_name="Doe")
+        session.add(singer)
+        session.commit()
+
+
+if __name__ == "__main__":
+    run_sample(database_role_sample)
diff --git a/test/mockserver_tests/test_basics.py b/test/mockserver_tests/test_basics.py
index cffbda0d..3e422885 100644
--- a/test/mockserver_tests/test_basics.py
+++ b/test/mockserver_tests/test_basics.py
@@ -267,6 +267,25 @@ class Singer(Base):
             session.add(singer)
             session.commit()
 
+    def test_database_role(self):
+        add_select1_result()
+        engine = create_engine(
+            "spanner:///projects/p/instances/i/databases/d",
+            connect_args={
+                "client": self.client,
+                "pool": FixedSizePool(size=10),
+                "database_role": "my_role",
+            },
+        )
+        with Session(engine.execution_options(isolation_level="autocommit")) as session:
+            session.execute(select(1))
+        requests = self.spanner_service.requests
+        eq_(2, len(requests))
+        is_instance_of(requests[0], BatchCreateSessionsRequest)
+        is_instance_of(requests[1], ExecuteSqlRequest)
+        request: BatchCreateSessionsRequest = requests[0]
+        eq_("my_role", request.session_template.creator_role)
+
     def test_select_table_in_named_schema(self):
         class Base(DeclarativeBase):
             pass

From a6a2917e5a19d75e2445b9329113c54bcbd92992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Mon, 2 Jun 2025 09:02:04 +0200
Subject: [PATCH 2/2] chore: update minimum Spanner version + add sample to nox

---
 samples/{database_role.py => database_role_sample.py} | 0
 samples/noxfile.py                                    | 5 +++++
 setup.py                                              | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename samples/{database_role.py => database_role_sample.py} (100%)

diff --git a/samples/database_role.py b/samples/database_role_sample.py
similarity index 100%
rename from samples/database_role.py
rename to samples/database_role_sample.py
diff --git a/samples/noxfile.py b/samples/noxfile.py
index 82019f5b..2ea2c37a 100644
--- a/samples/noxfile.py
+++ b/samples/noxfile.py
@@ -77,6 +77,11 @@ def read_only_transaction(session):
     _sample(session)
 
 
+@nox.session()
+def database_role(session):
+    _sample(session)
+
+
 @nox.session()
 def _all_samples(session):
     _sample(session)
diff --git a/setup.py b/setup.py
index 763df270..74ad4214 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 description = "SQLAlchemy dialect integrated into Cloud Spanner database"
 dependencies = [
     "sqlalchemy>=1.1.13",
-    "google-cloud-spanner>=3.54.0",
+    "google-cloud-spanner>=3.55.0",
     "alembic",
 ]
 extras = {