fix(spanner): update samples database and emulator DDL

samples/samples/conftest.py

@@ -203,13 +203,13 @@ def database_id():
 def proto_columns_database(
     spanner_client,
     sample_instance,
-    database_id,
+    proto_columns_database_id,
     proto_columns_database_ddl,
     database_dialect,
 ):
     if database_dialect == DatabaseDialect.GOOGLE_STANDARD_SQL:
         sample_database = sample_instance.database(
-            database_id,
+            proto_columns_database_id,
             ddl_statements=proto_columns_database_ddl,
         )
 

samples/samples/snippets_test.py

@@ -102,6 +102,11 @@ def default_leader_database_id():
     return f"leader_db_{uuid.uuid4().hex[:10]}"
 
 
+@pytest.fixture(scope="module")
+def proto_columns_database_id():
+    return f"test-db-proto-{uuid.uuid4().hex[:10]}"
+
+
 @pytest.fixture(scope="module")
 def database_ddl():
     """Sequence of DDL statements used to set up the database.

tests/_fixtures.py

@@ -106,6 +106,10 @@
     phone_number STRING(1024) )
     PRIMARY KEY (contact_id, phone_type),
     INTERLEAVE IN PARENT contacts ON DELETE CASCADE;
+CREATE PROTO BUNDLE (
+    examples.spanner.music.SingerInfo,
+    examples.spanner.music.Genre,
+    );
 CREATE TABLE all_types (
     pkey INT64 NOT NULL,
     int_value INT64,

tests/system/test_session_api.py

@@ -1543,7 +1543,6 @@ def test_multiuse_snapshot_read_isolation_exact_staleness(sessions_database):
         sd._check_row_data(after, all_data_rows)
 
 
-@pytest.mark.skipif(_helpers.USE_EMULATOR, reason="b/338557401")
 def test_read_w_index(
     shared_instance,
     database_operation_timeout,