google-cloud-spanner 2.35.0 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f2092db61c2ca6c7797176db72845ee4889255ed94d641d27ea8b5ac42f62b7
-  data.tar.gz: 3430361284c44739652f9ca1785a902cfccafc813e9b7833df854f0836df98c4
+  metadata.gz: c29026317ec1d049671bb84fe53bb524d37c47d193273e7833476c7910f973ff
+  data.tar.gz: b1f38f9d6ee9b1f6f943285e75bab33d33f5cbe7da56e56c4e44f5a4e39e98c0
 SHA512:
-  metadata.gz: 4edac28e59ec12727331f7810325de889c71154d28a3fb1dc155ec8d92f2f3b0a5a3e1168cc7a7949befd72bb13da25194107041021872778486ea8744a49c00
-  data.tar.gz: '018fba01b2d4dd8b16483a4a752c7768e8f512637973bdaf080cf7da8e14e20db8cae51ca0843de1b51dffdadfc4c0e5867bbbd94402d12cc8ecb9373416e1fa'
+  metadata.gz: 318b3243859a85c920190de101f5426873eb7bf573ed0bd8e9afbce931f6b8faf4c0b25406a69aad77b2c4ef1f93fd5751f00a9127b07a05fbf58a69c4db0ce3
+  data.tar.gz: eb54fca70387011e9718590c81a4249f5e681a43e6e6fa640aa032e801433c414769e2a255f270dde193994655455cee3344db9e67717a2adda12e176d5334b5

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release History
 
+### 2.36.0 (2026-05-08)
+
+#### Features
+
+* set txn opts at client level ([#234](https://github.com/googleapis/ruby-spanner/issues/234)) 
+#### Bug Fixes
+
+* lift up and fix circular requires ([#226](https://github.com/googleapis/ruby-spanner/issues/226)) 
+
 ### 2.35.0 (2026-02-23)
 
 #### Features

data/lib/google/cloud/spanner/client.rb

@@ -14,7 +14,6 @@
 
 
 require "google/cloud/spanner/errors"
-require "google/cloud/spanner/project"
 require "google/cloud/spanner/data"
 require "google/cloud/spanner/session_cache"
 require "google/cloud/spanner/session_creation_options"
@@ -72,10 +71,25 @@ module Google
         # @param directed_read_options [::Hash, nil] Optional. Client options used to set
         #   the `directed_read_options` for all ReadRequests and ExecuteSqlRequests.
         #   Converts to `V1::DirectedReadOptions`. Example option: `:exclude_replicas`.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transactions.
+        #   Can be overridden by the isolation level set on the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transactions.
+        #   Can be overridden by the read lock mode set on the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
         # @private
         def initialize project, instance_id, database_id, session_labels: nil,
                        pool_opts: {}, query_options: nil, database_role: nil,
-                       directed_read_options: nil
+                       directed_read_options: nil, isolation_level: nil, read_lock_mode: nil
           @project = project
           @instance_id = instance_id
           @database_id = database_id
@@ -83,6 +97,8 @@ module Google
           @session_labels = session_labels
           @query_options = query_options
           @directed_read_options = directed_read_options
+          @isolation_level = isolation_level
+          @read_lock_mode = read_lock_mode
 
           _pool_opts = pool_opts # unused. Here only to avoid having to disable Rubocop's Lint/UnusedMethodArgument
 
@@ -1071,8 +1087,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1110,12 +1124,22 @@ module Google
         #       trigger a retry.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1179,11 +1203,11 @@ module Google
           @pool.with_session do |session|
             session.upsert table, rows,
                            exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-                           isolation_level: isolation_level,
+                           isolation_level: isolation_level || @isolation_level,
                            commit_options: commit_options,
                            request_options: request_options,
                            call_options: call_options,
-                           read_lock_mode: read_lock_mode
+                           read_lock_mode: read_lock_mode || @read_lock_mode
           end
         end
         alias save upsert
@@ -1230,8 +1254,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1270,13 +1292,22 @@ module Google
         #
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
-        #
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1340,11 +1371,11 @@ module Google
           @pool.with_session do |session|
             session.insert table, rows,
                            exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-                           isolation_level: isolation_level,
+                           isolation_level: isolation_level || @isolation_level,
                            commit_options: commit_options,
                            request_options: request_options,
                            call_options: call_options,
-                           read_lock_mode: read_lock_mode
+                           read_lock_mode: read_lock_mode || @read_lock_mode
           end
         end
 
@@ -1390,8 +1421,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1429,13 +1458,22 @@ module Google
         #       trigger a retry.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
-        #
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1498,11 +1536,11 @@ module Google
           @pool.with_session do |session|
             session.update table, rows,
                            exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-                           isolation_level: isolation_level,
+                           isolation_level: isolation_level || @isolation_level,
                            commit_options: commit_options,
                            request_options: request_options,
                            call_options: call_options,
-                           read_lock_mode: read_lock_mode
+                           read_lock_mode: read_lock_mode || @read_lock_mode
           end
         end
 
@@ -1550,8 +1588,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1589,13 +1625,22 @@ module Google
         #       trigger a retry.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
-        #
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1655,11 +1700,11 @@ module Google
           @pool.with_session do |session|
             session.replace table, rows,
                             exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-                            isolation_level: isolation_level,
+                            isolation_level: isolation_level || @isolation_level,
                             commit_options: commit_options,
                             request_options: request_options,
                             call_options: call_options,
-                            read_lock_mode: read_lock_mode
+                            read_lock_mode: read_lock_mode || @read_lock_mode
           end
         end
 
@@ -1686,8 +1731,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1725,13 +1768,22 @@ module Google
         #       trigger a retry.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
-        #
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1788,11 +1840,11 @@ module Google
           @pool.with_session do |session|
             session.delete table, keys,
                            exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-                           isolation_level: isolation_level,
+                           isolation_level: isolation_level || @isolation_level,
                            commit_options: commit_options,
                            request_options: request_options,
                            call_options: call_options,
-                           read_lock_mode: read_lock_mode
+                           read_lock_mode: read_lock_mode || @read_lock_mode
           end
         end
 
@@ -1814,8 +1866,6 @@ module Google
         # @param [Boolean] exclude_txn_from_change_streams If set to true,
         #   mutations will not be recorded in change streams with DDL option
         #   `allow_txn_exclusion=true`.
-        # @param [Google::Cloud::Spanner::V1::TransactionOptions::IsolationLevel] isolation_level Optional. The
-        #   isolation level for the transaction.
         # @param [Hash] commit_options A hash of commit options.
         #   e.g., return_commit_stats. Commit options are optional.
         #   The following options can be provided:
@@ -1856,13 +1906,20 @@ module Google
         # @yieldparam [Google::Cloud::Spanner::Commit] commit The Commit object.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   moce will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
         #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
         #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
         #       but instead on a commit to validate that the data has not changed since the transaction started.
         #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1931,11 +1988,11 @@ module Google
           @pool.with_session do |session|
             session.commit(
               exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-              isolation_level: isolation_level,
+              isolation_level: isolation_level || @isolation_level,
               commit_options: commit_options,
               request_options: request_options,
               call_options: call_options,
-              read_lock_mode: read_lock_mode,
+              read_lock_mode: read_lock_mode || @read_lock_mode,
               &block
             )
           end
@@ -2103,12 +2160,22 @@ module Google
         #       trigger a retry.
         #
         # @param [Google::Cloud::Spanner::V1::TransactionOptions::ReadWrite::ReadLockMode] read_lock_mode
-        #   The read lock mode for the transaction.
+        #   The read lock mode for the transaction. If not specified, the client-level read lock
+        #   mode will be used.
         #   Can be one of the following:
         #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
-        #   * `:PESSIMISTIC` : The pessimistic lock mode, where read locks are acquired immediately on read.
-        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks for reads are not acquired on read
-        #       but instead on a commit to validate that the data has not changed since the transaction started.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   If not specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         #
         #
         # @yield [transaction] The block for reading and writing data.
@@ -2213,7 +2280,8 @@ module Google
         #   end
         #
         def transaction deadline: 120, exclude_txn_from_change_streams: false,
-                        commit_options: nil, request_options: nil, call_options: nil, read_lock_mode: nil
+                        commit_options: nil, request_options: nil, call_options: nil, read_lock_mode: nil,
+                        isolation_level: nil
           ensure_service!
           unless Thread.current[IS_TRANSACTION_RUNNING_KEY].nil?
             raise "Nested transactions are not allowed"
@@ -2230,8 +2298,9 @@ module Google
             transaction_tag = request_options[:transaction_tag] if request_options
             tx = session.create_empty_transaction \
               exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-              read_lock_mode: read_lock_mode,
-              transaction_tag: transaction_tag
+              read_lock_mode: read_lock_mode || @read_lock_mode,
+              transaction_tag: transaction_tag,
+              isolation_level: isolation_level || @isolation_level
 
             begin
               Thread.current[IS_TRANSACTION_RUNNING_KEY] = true

data/lib/google/cloud/spanner/convert.rb

@@ -18,7 +18,6 @@ require "date"
 require "stringio"
 require "base64"
 require "bigdecimal"
-require "google/cloud/spanner/data"
 require "google/cloud/spanner/interval"
 
 module Google

data/lib/google/cloud/spanner/project.rb

@@ -14,9 +14,6 @@
 
 
 require "google/cloud/spanner/errors"
-require "google/cloud/spanner/service"
-require "google/cloud/spanner/client"
-require "google/cloud/spanner/batch_client"
 require "google/cloud/spanner/instance"
 require "google/cloud/spanner/database"
 require "google/cloud/spanner/range"
@@ -551,6 +548,22 @@ module Google
         #      Spanner will wait for a replica in the list to become available,
         #      requests may fail due to DEADLINE_EXCEEDED errors.
         #
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transactions. Can be
+        #   overridden by the isolation level set on the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transactions. Can be
+        #   overridden by the read lock mode set on the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        #
         # @return [::Google::Cloud::Spanner::Client] The newly created client.
         #
         # @example
@@ -569,7 +582,8 @@ module Google
         #   end
         #
         def client instance_id, database_id, pool: {}, labels: nil,
-                   query_options: nil, database_role: nil, directed_read_options: nil
+                   query_options: nil, database_role: nil, directed_read_options: nil,
+                   isolation_level: nil, read_lock_mode: nil
           # Convert from possible Google::Protobuf::Map
           labels = labels.to_h { |k, v| [String(k), String(v)] } if labels
           # Configs set by environment variables take over client-level configs.
@@ -585,7 +599,9 @@ module Google
                      session_labels: labels,
                      query_options: query_options,
                      database_role: database_role,
-                     directed_read_options: directed_read_options
+                     directed_read_options: directed_read_options,
+                     isolation_level: isolation_level,
+                     read_lock_mode: read_lock_mode
         end
 
         ##

data/lib/google/cloud/spanner/service.rb

@@ -19,7 +19,6 @@ require "google/cloud/spanner/version"
 require "google/cloud/spanner/v1"
 require "google/cloud/spanner/admin/instance/v1"
 require "google/cloud/spanner/admin/database/v1"
-require "google/cloud/spanner/convert"
 require "google/cloud/spanner/lar_headers"
 
 module Google
@@ -641,6 +640,19 @@ module Google
         #   An id of the previous transaction, if this new transaction wrapper is being created
         #   as a part of a retry. Previous transaction id should be added to TransactionOptions
         #   of a new ReadWrite transaction when retry is attempted.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         # @private
         # @return [::Google::Cloud::Spanner::V1::Transaction]
         def begin_transaction session_name,
@@ -650,7 +662,8 @@ module Google
                               route_to_leader: nil,
                               mutation_key: nil,
                               previous_transaction_id: nil,
-                              read_lock_mode: nil
+                              read_lock_mode: nil,
+                              isolation_level: nil
           read_write = if previous_transaction_id.nil?
                          V1::TransactionOptions::ReadWrite.new
                        else
@@ -665,7 +678,8 @@ module Google
 
           tx_opts = V1::TransactionOptions.new(
             read_write: read_write,
-            exclude_txn_from_change_streams: exclude_txn_from_change_streams
+            exclude_txn_from_change_streams: exclude_txn_from_change_streams,
+            isolation_level: isolation_level
           )
 
           opts = default_options session_name: session_name,

data/lib/google/cloud/spanner/session.rb

@@ -1521,13 +1521,26 @@ module Google
         #   of a new ReadWrite transaction when retry is attempted.
         # @param transaction_tag [::String, nil] Optional.
         #   A tag used for statistics collection about this transaction.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction] The new *empty-wrapper* transaction object.
         def create_empty_transaction exclude_txn_from_change_streams: false, previous_transaction_id: nil,
-                                     read_lock_mode: nil, transaction_tag: nil
+                                     read_lock_mode: nil, transaction_tag: nil, isolation_level: nil
           Transaction.from_grpc nil, self, exclude_txn_from_change_streams: exclude_txn_from_change_streams,
                                 previous_transaction_id: previous_transaction_id, read_lock_mode: read_lock_mode,
-                                transaction_tag: transaction_tag
+                                transaction_tag: transaction_tag, isolation_level: isolation_level
         end
 
         # If the session is non-multiplexed, keeps the session alive by executing `"SELECT 1"`.

data/lib/google/cloud/spanner/transaction.rb

@@ -129,12 +129,13 @@ module Google
         # @private
         # @return [::Google::Cloud::Spanner::Transaction]
         def initialize grpc, session, exclude_txn_from_change_streams, previous_transaction_id: nil,
-                       read_lock_mode: nil, transaction_tag: nil
+                       read_lock_mode: nil, transaction_tag: nil, isolation_level: nil
           @grpc = grpc
           @session = session
           @exclude_txn_from_change_streams = exclude_txn_from_change_streams
           @read_lock_mode = read_lock_mode
           @transaction_tag = transaction_tag
+          @isolation_level = isolation_level
 
           # throwing away empty strings for simplicity
           unless previous_transaction_id.nil? || previous_transaction_id.empty?
@@ -144,7 +145,6 @@ module Google
           @commit = Commit.new
           @seqno = 0
           @exclude_txn_from_change_streams = false
-          @read_lock_mode = nil
 
           # Mutex to enfore thread safety for transaction creation and query executions.
           #
@@ -1259,12 +1259,25 @@ module Google
         #   of a new ReadWrite transaction when retry is attempted.
         # @param transaction_tag [::String, nil] Optional.
         #   A tag used for statistics collection about this transaction.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction]
         def self.from_grpc grpc, session, exclude_txn_from_change_streams: false, previous_transaction_id: nil,
-                           read_lock_mode: nil, transaction_tag: nil
+                           read_lock_mode: nil, transaction_tag: nil, isolation_level: nil
           new grpc, session, exclude_txn_from_change_streams, previous_transaction_id: previous_transaction_id,
-              read_lock_mode: read_lock_mode, transaction_tag: transaction_tag
+              read_lock_mode: read_lock_mode, transaction_tag: transaction_tag, isolation_level: isolation_level
         end
 
         ##
@@ -1288,11 +1301,24 @@ module Google
         #   Example option: `:priority`.
         # @param call_options [::Hash, nil] Optional. A hash of values to specify the custom
         #   call options. Example option `:timeout`.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transaction.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         # @private
         # @return [::Google::Cloud::Spanner::V1::Transaction, nil] The new transaction
         #   object, or `nil` if a transaction already exists.
         def safe_begin_transaction! exclude_from_change_streams: false, request_options: nil, call_options: nil,
-                                    read_lock_mode: nil
+                                    read_lock_mode: nil, isolation_level: nil
           # If a read-write transaction on a multiplexed session commit mutations
           # without performing any reads or queries, one of the mutations from the mutation set
           # must be sent as a mutation key for `BeginTransaction`.
@@ -1315,7 +1341,8 @@ module Google
               route_to_leader: route_to_leader,
               mutation_key: mutation_key,
               previous_transaction_id: previous_transaction_id,
-              read_lock_mode: read_lock_mode
+              read_lock_mode: read_lock_mode || @read_lock_mode,
+              isolation_level: isolation_level || @isolation_level
             )
           end
         end
@@ -1357,9 +1384,24 @@ module Google
         # @param exclude_txn_from_change_streams [::Boolean] Optional. Defaults to `false`.
         #   When `exclude_txn_from_change_streams` is set to `true`, it prevents read
         #   or write transactions from being tracked in change streams.
+        # @param read_lock_mode [::Symbol, nil] Optional. The read lock mode for the transaction. If not
+        #   specified, the client-level read lock mode will be used.
+        #   Can be one of the following:
+        #   * `:READ_LOCK_MODE_UNSPECIFIED` : The default unspecified read lock mode.
+        #   * `:PESSIMISTIC` : The pessimistic lock mode, where depending on the isolation level and/or lock
+        #       requested, locks are acquired on read.
+        #   * `:OPTIMISTIC` : The optimistic lock mode, where locks are not acquired on read. Depending on the
+        #       isolation level and/or lock requested on a read, data may be validated at commit time to be not
+        #       changed since the transaction started.
+        # @param isolation_level [::Symbol, nil] Optional. The isolation level for the transaction. If not
+        #   specified, the client-level isolation level will be used.
+        #   Can be one of the following:
+        #   * `:ISOLATION_LEVEL_UNSPECIFIED` : The default unspecified isolation level.
+        #   * `:SERIALIZABLE` : The serializable isolation level.
+        #   * `:REPEATABLE_READ` : The repeatable read isolation level.
         # @private
         # @return [::Google::Cloud::Spanner::V1::TransactionSelector]
-        def tx_selector exclude_txn_from_change_streams: false, read_lock_mode: nil
+        def tx_selector exclude_txn_from_change_streams: false, read_lock_mode: nil, isolation_level: nil
           return V1::TransactionSelector.new id: transaction_id if existing_transaction?
 
           read_write = if @previous_transaction_id.nil?
@@ -1370,14 +1412,16 @@ module Google
                          )
                        end
 
-          unless read_lock_mode.nil?
-            read_write.read_lock_mode = read_lock_mode
+          read_lock = read_lock_mode || @read_lock_mode
+          unless read_lock.nil?
+            read_write.read_lock_mode = read_lock
           end
 
           V1::TransactionSelector.new(
             begin: V1::TransactionOptions.new(
               read_write: read_write,
-              exclude_txn_from_change_streams: exclude_txn_from_change_streams
+              exclude_txn_from_change_streams: exclude_txn_from_change_streams,
+              isolation_level: isolation_level || @isolation_level
             )
           )
         end

data/lib/google/cloud/spanner/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Spanner
-      VERSION = "2.35.0".freeze
+      VERSION = "2.36.0".freeze
     end
   end
 end

data/lib/google/cloud/spanner.rb

@@ -14,7 +14,10 @@
 
 
 require "google-cloud-spanner"
+require "google/cloud/spanner/batch_client"
+require "google/cloud/spanner/client"
 require "google/cloud/spanner/project"
+require "google/cloud/spanner/service"
 require "google/cloud/spanner/spanner_error"
 require "google/cloud/spanner/request_id_interceptor"
 require "google/cloud/config"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.36.0
 platform: ruby
 authors:
 - Mike Moore
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="