google-cloud-spanner 2.27.0 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2950745d1ef3cf6be982e2bc64a29ce467e8a15710293265181d41dd138a80ad
-  data.tar.gz: 6e96c531e76300e6d77d5d261ec0d09da96157f82aa3f4c32c502b52ce6b6f74
+  metadata.gz: c47f3cfa10a6d612de5578cd6602dece290f316246a809a265b504fc74737307
+  data.tar.gz: fe95585faa6210cb5110dbc54e3bb95e0a9126577c1893854880ebd8232946a1
 SHA512:
-  metadata.gz: 55291fac48fb628c64d4df17266cf1a07babbd918b8411e7116e8ba23b0430c20dbf0f210098f27052bbcd9d97c9e3ed0ec2937a4c342cb5994946df2dcf2ac6
-  data.tar.gz: b2e91d7c79a316a69b3657eace1232936a13013236117170b974a9487e0d9fdd5c9de34bba851ffbe310a26c6864954fd94de68df91fdb1a9d64bd06773d5aff
+  metadata.gz: fa836a8f8a9e7da61b9ca53e655a8ab0870dcc50435756af6d2637931b9f16c1f12853a4eab16038176ca4b85395f6d83d7cbccec9a8c37ad5c562f9ee83ad2e
+  data.tar.gz: 873894c371f0f7e9679a4df3f4b8fdc28e0047f135584b11616bc25f53982ef42b378cd323c3216d2283f6517071d218dc8a1c7a60fb1b842bac9422fa0b3bda

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Release History
 
+### 2.29.0 (2025-11-06)
+
+#### Features
+
+* allow sending request tags for snapshot queries ([#200](https://github.com/googleapis/ruby-spanner/issues/200)) 
+#### Bug Fixes
+
+* Don't route to leader for single-use transactions in Client#execute_query ([#201](https://github.com/googleapis/ruby-spanner/issues/201)) 
+
+### 2.28.0 (2025-10-22)
+
+#### Features
+
+* Add support for order_by and lock_hint options ([#182](https://github.com/googleapis/ruby-spanner/issues/182))
+ 
+#### Bug Fixes
+
+* use create Transaction when retrying when enumerating rows in `Spanner::Results` ([#191](https://github.com/googleapis/ruby-spanner/issues/191))
+* run explicit BeginTransaction in Client#transaction for mutation-only payloads ([#191](https://github.com/googleapis/ruby-spanner/issues/191))
+* Transaction#initialize is no longer incorrectly marked as public in documentation ([#191](https://github.com/googleapis/ruby-spanner/issues/191))
+* several field accessors in Partition are no longer incorrectly marked as public in documentation ([#191](https://github.com/googleapis/ruby-spanner/issues/191))
+* session keepalive uses Process.clock_gettime instead of Time.now ([#185](https://github.com/googleapis/ruby-spanner/pull/185)) 
+
 ### 2.27.0 (2025-05-28)
 
 #### Features

data/lib/google/cloud/spanner/backup/job/list.rb

@@ -33,8 +33,9 @@ module Google
           #   {Google::Cloud::Spanner::Admin::Database.database_admin}.list_backup_operations instead.
           #
           class List < DelegateClass(::Array)
+            # The `Spanner::Service` reference.
             # @private
-            # The gRPC Service object.
+            # @return [::Google::Cloud::Spanner::Service]
             attr_accessor :service
 
             # @private
@@ -148,13 +149,14 @@ module Google
               end
             end
 
-            ##
-            # @private
-            #
-            # New Backup::Job::List from a
+            # Creates a new `Spanner::Backup::Job::List` of `Gapic::Operation` operations from a
             # `Gapic::PagedEnumerable<Google::Longrunning::Operation>`
             # object. Operation object is a backup operation.
-            #
+            # @param grpc [::Gapic::PagedEnumerable<::Google::Longrunning::Operation>]
+            #   Wrapped `Gapic::PagedEnumberable` reference.
+            # @param service [::Google::Cloud::Spanner::Service] A `Spanner::Service` reference.
+            # @private
+            # @return [::Google::Cloud::Spanner::Backup::Job::List]
             def self.from_grpc grpc, service
               operations_client =
                 service.databases.instance_variable_get "@operations_client"

data/lib/google/cloud/spanner/backup/job.rb

@@ -58,12 +58,14 @@ module Google
         #   end
         #
         class Job
-          ##
-          # @private The `Gapic::Operation` gRPC object.
+          # The wrapped `Gapic::Operation` object.
+          # @private
+          # @return [::Gapic::Operation]
           attr_accessor :grpc
 
-          ##
-          # @private The gRPC Service object.
+          # The `Spanner::Service` reference.
+          # @private
+          # @return [::Google::Cloud::Spanner::Service]
           attr_accessor :service
 
           ##
@@ -265,8 +267,11 @@ module Google
             Convert.timestamp_to_time @grpc.metadata.cancel_time
           end
 
-          ##
-          # @private New Backup::Job from a `Gapic::Operation` object.
+          # Create a new Backup::Job from a `Gapic::Operation` object.
+          # @param grpc [::Gapic::Operation`] The wrapped `Gapic::Operation` object.
+          # @param service [::Google::Cloud::Spanner::Service] A `Spanner::Service` reference.
+          # @private
+          # @return [::Google::Cloud::Spanner::Backup::Job]
           def self.from_grpc grpc, service
             new.tap do |job|
               job.instance_variable_set :@grpc, grpc

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

@@ -63,8 +63,18 @@ module Google
       #     new_partition
       #
       class BatchClient
-        ##
-        # @private Creates a new Spanner BatchClient instance.
+        # Creates a new Spanner BatchClient instance.
+        # @param project [::Google::Cloud::Spanner::Project] A `Spanner::Project` ref.
+        # @param instance_id [::String] Instance id, e.g. `"my-instance"`.
+        # @param database_id [::String] Database id, e.g. `"my-database"`.
+        # @param session_labels [::Hash, nil] Optional. The labels to be applied to all sessions
+        #   created by the client. Example: `"team" => "billing-service"`.
+        # @param query_options [::Hash, nil] Optional. A hash of values to specify the custom
+        #   query options for executing SQL query. Example parameter `:optimizer_version`.
+        # @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`.
+        # @private
         def initialize project, instance_id, database_id, session_labels: nil,
                        query_options: nil, directed_read_options: nil
           @project = project
@@ -404,15 +414,18 @@ module Google
 
         protected
 
-        ##
-        # @private Raise an error unless an active connection to the service is
+        # Raise an error unless an active connection to the service is
         # available.
+        # @private
+        # @raise [StandardError]
+        # @return [nil]
         def ensure_service!
           raise "Must have active connection to service" unless @project.service
         end
 
-        ##
         # New session for each use.
+        # @private
+        # @return [::Google::Cloud::Spanner::Session]
         def session
           ensure_service!
           grpc = @project.service.create_session \

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

@@ -51,12 +51,26 @@ module Google
       #   end
       #
       class Client
-        ##
+        # A semi-arbitrary constant for thread-wide global parameter name
         # @private
         IS_TRANSACTION_RUNNING_KEY = "ruby_spanner_is_transaction_running".freeze
 
-        ##
-        # @private Creates a new Spanner Client instance.
+        # Creates a new Spanner Client instance.
+        # @param project [::Google::Cloud::Spanner::Project] A `Spanner::Project` ref.
+        # @param instance_id [::String] Instance id, e.g. `"my-instance"`.
+        # @param database_id [::String] Database id, e.g. `"my-database"`.
+        # @param session_labels [::Hash, nil] Optional. The labels to be applied to all sessions
+        #   created by the client. Example: `"team" => "billing-service"`.
+        # @param pool_opts [::Hash] Optional. `Spanner::Pool` creation options.
+        #   Example parameter: `:keepalive`.
+        # @param query_options [::Hash, nil] Optional. A hash of values to specify the custom
+        #   query options for executing SQL query. Example parameter `:optimizer_version`.
+        # @param database_role [::String, nil] Optional. The Spanner session creator role.
+        #   Example: `analyst`
+        # @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`.
+        # @private
         def initialize project, instance_id, database_id, session_labels: nil,
                        pool_opts: {}, query_options: nil, database_role: nil,
                        directed_read_options: nil
@@ -89,7 +103,7 @@ module Google
         end
 
         # The Spanner project connected to.
-        # @return [Project]
+        # @return [::Google::Cloud::Spanner::Project]
         def project
           @project
         end
@@ -470,7 +484,7 @@ module Google
           request_options = Convert.to_request_options request_options,
                                                        tag_type: :request_tag
           single_use_tx = single_use_transaction single_use
-          route_to_leader = LARHeaders.execute_query true
+          route_to_leader = LARHeaders.execute_query false
           results = nil
           @pool.with_session do |session|
             results = session.execute_query \
@@ -878,6 +892,14 @@ module Google
         #      and all replicas are exhausted without finding a healthy replica,
         #      Spanner will wait for a replica in the list to become available,
         #      requests may fail due to DEADLINE_EXCEEDED errors.
+        # @param [::Google::Cloud::Spanner::V1::ReadRequest::OrderBy] order_by An option to control the order in which
+        #   rows are returned from a read.
+        #   To see the available options refer to
+        #   [Google::Cloud::Spanner::V1::ReadRequest::OrderBy](https://cloud.google.com/ruby/docs/reference/google-cloud-spanner-v1/latest/Google-Cloud-Spanner-V1-ReadRequest-OrderBy)
+        # @param [::Google::Cloud::Spanner::V1::ReadRequest::LockHint] lock_hint A lock hint mechanism for reads done
+        #   within a transaction.
+        #   To see the available options refer to
+        #   [Google::Cloud::Spanner::V1::ReadRequest::LockHint](https://cloud.google.com/ruby/docs/reference/google-cloud-spanner-v1/latest/Google-Cloud-Spanner-V1-ReadRequest-LockHint)
         #
         # @return [Google::Cloud::Spanner::Results] The results of the read.
         #
@@ -962,7 +984,7 @@ module Google
         #
         def read table, columns, keys: nil, index: nil, limit: nil,
                  single_use: nil, request_options: nil, call_options: nil,
-                 directed_read_options: nil
+                 directed_read_options: nil, order_by: nil, lock_hint: nil
           validate_single_use_args! single_use
           ensure_service!
 
@@ -981,7 +1003,9 @@ module Google
                               request_options: request_options,
                               call_options: call_options,
                               directed_read_options: directed_read_options || @directed_read_options,
-                              route_to_leader: route_to_leader
+                              route_to_leader: route_to_leader,
+                              order_by: order_by,
+                              lock_hint: lock_hint
           end
           results
         end
@@ -2102,15 +2126,28 @@ module Google
             begin
               Thread.current[IS_TRANSACTION_RUNNING_KEY] = true
               yield tx
-              transaction_id = nil
-              transaction_id = tx.transaction_id if tx.existing_transaction?
-              commit_resp = @project.service.commit \
-                tx.session.path, tx.mutations,
+
+              unless tx.existing_transaction?
+                # This can happen if the yielded `tx` object was only used to add mutations.
+                # Then it never called any RPCs and didn't create a server-side Transaction object.
+                # In which case we should make an explicit BeginTransaction call here.
+                tx.safe_begin_transaction!(
+                  exclude_from_change_streams: exclude_txn_from_change_streams,
+                  request_options: request_options,
+                  call_options: call_options
+                )
+              end
+
+              transaction_id = tx.transaction_id
+              commit_resp = @project.service.commit(
+                tx.session.path,
+                tx.mutations,
                 transaction_id: transaction_id,
                 exclude_txn_from_change_streams: exclude_txn_from_change_streams,
                 commit_options: commit_options,
                 request_options: request_options,
                 call_options: call_options
+              )
               resp = CommitResponse.from_grpc commit_resp
               commit_options ? resp : resp.timestamp
             rescue GRPC::Aborted,
@@ -2409,17 +2446,21 @@ module Google
           @pool.reset
         end
 
-        ##
+        # Creates a new Session objece.
+        # @param multiplexed [::Boolean] Optional. Default to `false`.
+        #   If `true`, specifies a multiplexed session.
         # @private
-        # Creates a new session object every time.
-        def create_new_session
+        # @return [::Google::Cloud::Spanner::Session]
+        def create_new_session multiplexed: false
           ensure_service!
           grpc = @project.service.create_session \
             Admin::Database::V1::DatabaseAdmin::Paths.database_path(
               project: project_id, instance: instance_id, database: database_id
             ),
             labels: @session_labels,
-            database_role: @database_role
+            database_role: @database_role,
+            multiplexed: multiplexed
+
           Session.from_grpc grpc, @project.service, query_options: @query_options
         end
 

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

@@ -74,11 +74,16 @@ module Google
       #   end
       #
       class Instance
-        ##
-        # @private The gRPC Service object.
+        # The `Spanner::Service` reference.
+        # @private
+        # @return [::Google::Cloud::Spanner::Service]
         attr_accessor :service
 
-        # @private Creates a new Instance instance.
+        # Creates a new `Spanner::Instance` instance.
+        # @param grpc [::Google::Cloud::Spanner::Admin::Instance::V1::Instance]
+        #   The protobuf `V1::Instance` underlying object.
+        # @param service [::Google::Cloud::Spanner::Service] A `Spanner::Service` reference.
+        # @private
         def initialize grpc, service
           @grpc = grpc
           @service = service
@@ -957,9 +962,13 @@ module Google
           grpc.permissions
         end
 
-        ##
-        # @private Creates a new Instance instance from a
+        # Creates a new Instance instance from a
         # `Google::Cloud::Spanner::Admin::Instance::V1::Instance`.
+        # @param grpc [::Google::Cloud::Spanner::Admin::Instance::V1::Instance]
+        #   The protobuf `V1::Instance` underlying object.
+        # @param service [::Google::Cloud::Spanner::Service] A `Spanner::Service` reference.
+        # @private
+        # @return [::Google::Cloud::Spanner::Instance]
         def self.from_grpc grpc, service
           new grpc, service
         end

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

@@ -75,7 +75,7 @@ module Google
               (?:T(?!$)
               (?:(?<hours>-?\d+)H)?
               (?:(?<minutes>-?\d+)M)?
-              (?:(?<seconds>-?(?!S)\d*(?:[\.,]\d{1,9})?)S)?)?
+              (?:(?<seconds>-?(?!S)\d*(?:[.,]\d{1,9})?)S)?)?
               $
             /x
             interval_months = 0

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

@@ -44,8 +44,14 @@ module Google
       #   results = batch_snapshot.execute_partition partition
       #
       class Partition
-        # @ private
+        # A `V1::ExecuteSqlRequest` that is related to this partition.
+        # @private
+        # @return [::Google::Cloud::Spanner::V1::ExecuteSqlRequest]
         attr_reader :execute
+
+        # A `V1::ReadRequest` that is related to this partition.
+        # @private
+        # @return [::Google::Cloud::Spanner::V1::ReadRequest]
         attr_reader :read
 
         ##

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

@@ -36,6 +36,16 @@ module Google
         # and `Session` objects as values.
         attr_accessor :sessions_in_use
 
+        # Creates a new Session pool that manages non-multiplexed sessions.
+        # @param client [::Google::Cloud::Spanner::Client] A `Spanner::Client` reference
+        # @param min [::Integer] Min number of sessions to keep
+        # @param max [::Integer] Max number of sessions to keep
+        # @param keepalive [::Numeric] How long after their last usage the sessions can be reclaimed
+        # @param fail [::Boolean] If `true` the pool will raise `SessionLimitError` if number of new sessions
+        #   needed is more that can be created due to the `max` parameter. If `false` it will wait instead.
+        # @param threads [::Integer, nil] Number of threads in the thread pool that is used for keepalive and
+        #   release session actions. If `nil` the Pool will choose a reasonable default.
+        # @private
         def initialize client, min: 10, max: 100, keepalive: 1800,
                        fail: true, threads: nil
           @client = client
@@ -52,6 +62,11 @@ module Google
           init
         end
 
+        # Provides a session for running an operation
+        # @yield session Session a client can use to run an operation
+        # @yieldparam [::Google::Cloud::Spanner::Session] `Spanner::Session` to run an operation
+        # @private
+        # @return [nil]
         def with_session
           session = checkout_session
           begin

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

@@ -66,12 +66,22 @@ module Google
       #   end
       #
       class Project
-        ##
-        # @private The Service object.
-        attr_accessor :service, :query_options
+        # The `Spanner::Service` reference.
+        # @private
+        # @return [::Google::Cloud::Spanner::Service]
+        attr_accessor :service
 
-        ##
-        # @private Creates a new Spanner Project instance.
+        # A hash of values to specify the custom query options for executing SQL query.
+        # Example option: `:optimizer_version`.
+        # @private
+        # @return [::Hash, nil]
+        attr_accessor :query_options
+
+        # Creates a new Spanner Project instance.
+        # @param service [::Google::Cloud::Spanner::Service] The `Spanner::Service` ref.
+        # @param query_options [::Hash, nil] Optional. A hash of values to specify the custom
+        #   query options for executing SQL query. Example option: `:optimizer_version`.
+        # @private
         def initialize service, query_options: nil
           @service = service
           @query_options = query_options
@@ -80,6 +90,8 @@ module Google
         ##
         # The identifier for the Cloud Spanner project.
         #
+        # @return [::String]
+        #
         # @example
         #   require "google/cloud"
         #

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

@@ -40,19 +40,44 @@ module Google
       #     puts "Column #{name} is type #{type}"
       #   end
       #
+      #   results.rows.each do |row|
+      #     puts "User #{row[:id]} is #{row[:name]}"
+      #   end
+      #
       class Results
-        ##
-        # @private Object of type
-        # Google::Cloud::Spanner::V1::ResultSetMetadata
+        # The `V1::ResultSetMetadata` protobuf object from the first
+        # PartialResultSet.
+        # @private
+        # @return [::Google::Cloud::Spanner::V1::ResultSetMetadata]
         attr_reader :metadata
 
+        # Creates a new Results instance.
+        # @param service [::Google::Cloud::Spanner::Service] The `Spanner::Service` reference.
+        # @param partial_result_sets [::Enumerable<::Google::Cloud::Spanner::V1::PartialResultSet>]
+        #   Raw enumerable from grpc `StreamingRead` call.
+        # @param session_name [::String] Required.
+        #   The session in which the transaction to be committed is running.
+        #   Values are of the form:
+        #   `projects/<project_id>/instances/<instance_id>/databases/<database_id>/sessions/<session_id>`.
+        # @param metadata [::Google::Cloud::Spanner::V1::ResultSetMetadata] ParialResultSet metadata object
+        # @param stats [::Google::Cloud::Spanner::V1::ResultSetStats] Query plan and execution statistics
+        #   for the statement that produced this streaming result set.
+        # @private
+        def initialize service, partial_result_sets, session_name, metadata, stats
+          @service = service
+          @partial_result_sets = partial_result_sets
+          @session_name = session_name
+          @metadata = metadata
+          @stats = stats
+        end
+
         ##
         # The read timestamp chosen for single-use snapshots (read-only
         # transactions).
         # @return [Time] The chosen timestamp.
         def timestamp
-          return nil if @metadata.nil? || @metadata.transaction.nil?
-          Convert.timestamp_to_time @metadata.transaction.read_timestamp
+          return nil if transaction.nil?
+          Convert.timestamp_to_time transaction.read_timestamp
         end
 
         ##
@@ -78,9 +103,9 @@ module Google
           @fields ||= Fields.from_grpc @metadata.row_type.fields
         end
 
-        ##
+        # Returns a transaction from the first ResultSet's metadata if available
         # @private
-        # Returns a transaction if available
+        # @return [::Google::Cloud::Spanner::V1::Transaction, nil]
         def transaction
           @metadata&.transaction
         end
@@ -128,16 +153,18 @@ module Google
           loop do
             begin
               if should_resume_request
-                @enum = resume_request(resume_token)
+                @partial_result_sets = resume_request(resume_token)
                 buffered_responses = []
                 should_resume_request = false
               elsif should_retry_request
-                @enum = retry_request()
+                @partial_result_sets = retry_request()
                 buffered_responses = []
                 should_retry_request = false
               end
 
-              grpc = @enum.next
+              # @type [::Google::Cloud::Spanner::V1::PartialResultsSet]
+              grpc = @partial_result_sets.next
+
               # metadata should be set before the first iteration...
               @metadata ||= grpc.metadata
               @stats ||= grpc.stats
@@ -243,13 +270,13 @@ module Google
         def resume_request resume_token
           if @execute_query_options
             @service.execute_streaming_sql(
-              @session_path,
+              @session_name,
               @sql,
               **@execute_query_options.merge(resume_token: resume_token)
             )
           else
             @service.streaming_read_table(
-              @session_path,
+              @session_name,
               @table,
               @columns,
               **@read_options.merge(resume_token: resume_token)
@@ -262,9 +289,9 @@ module Google
         # Retries a request, by re-executing it from scratch.
         def retry_request
           if @execute_query_options
-            @service.execute_streaming_sql @session_path, @sql, **@execute_query_options
+            @service.execute_streaming_sql @session_name, @sql, **@execute_query_options
           else
-            @service.streaming_read_table @session_path, @table, @columns, **@read_options
+            @service.streaming_read_table @session_name, @table, @columns, **@read_options
           end
         end
 
@@ -295,35 +322,80 @@ module Google
           @stats.row_count == :row_count_exact
         end
 
+        # Creates a `Spanner::Results` for a given `PartialResultSet` grpc stream.
+        # @param partial_result_sets [::Enumerable<::Google::Cloud::Spanner::V1::PartialResultSet>]
+        #   Raw enumerable from underlying grpc call.
+        # @param service [::Google::Cloud::Spanner::Service] The `Spanner::Service` reference.
+        # @param session_name [::String] Required.
+        #   The session in which the transaction to be committed is running.
+        #   Values are of the form:
+        #   `projects/<project_id>/instances/<instance_id>/databases/<database_id>/sessions/<session_id>`.
         # @private
-        def self.from_enum enum, service
-          grpc = enum.peek
-          new.tap do |results|
-            results.instance_variable_set :@metadata, grpc.metadata
-            results.instance_variable_set :@stats,    grpc.stats
-            results.instance_variable_set :@enum,     enum
-            results.instance_variable_set :@service,  service
-          end
+        # @return [::Google::Cloud::Spanner::Results]
+        def self.from_partial_result_sets partial_result_sets, service, session_name
+          # @type [::Google::Cloud::Spanner::V1::PartialResultSet]
+          partial_result_set = partial_result_sets.peek
+          metadata = partial_result_set.metadata
+          stats = partial_result_set.stats
+          new service, partial_result_sets, session_name, metadata, stats
         rescue GRPC::BadStatus => e
           raise Google::Cloud::Error.from_error(e)
         end
 
+        # Creates a `Spanner::Results` wrapper from ExecuteStreamingSql call results and params.
+        # @param response [::Enumerable<::Google::Cloud::Spanner::V1::PartialResultSet>]
+        #   Raw enumerable from grpc `ExecuteStreamingSql` call.
+        # @param service [::Google::Cloud::Spanner::Service] The `Spanner::Service` reference.
+        # @param session_name [::String] Required.
+        #   The session in which the transaction to be committed is running.
+        #   Values are of the form:
+        #   `projects/<project_id>/instances/<instance_id>/databases/<database_id>/sessions/<session_id>`.
+        # @param sql [::String] The SQL query string that was executed.
+        # @param execute_query_options [::Hash] Full request options
+        #   that were sent to the `service.execute_streaming_sql`. This hash joins params needed to
+        #   construct `::Gapic::CallOptions`, e.g. `call_options` and header-related `route_to_leader`
+        #   with params specific to `execute_streaming_sql`, such as `seqno`.
         # @private
-        def self.from_execute_query_response response, service, session_path, sql, execute_query_options
-          from_enum(response, service).tap do |results|
-            results.instance_variable_set :@session_path, session_path
+        # @return [::Google::Cloud::Spanner::Results]
+        def self.from_execute_query_response response, service, session_name, sql, execute_query_options
+          from_partial_result_sets(response, service, session_name).tap do |results|
+            execute_query_options_copy = execute_query_options.dup
+            unless results.metadata.transaction.nil?
+              execute_query_options_copy[:transaction] = V1::TransactionSelector.new id: results.metadata.transaction.id
+            end
+
             results.instance_variable_set :@sql, sql
-            results.instance_variable_set :@execute_query_options, execute_query_options
+            results.instance_variable_set :@execute_query_options, execute_query_options_copy
           end
         end
 
+        # Creates a `Spanner::Results` wrapper from StreamingRead call results and params.
+        # @param response [::Enumerable<::Google::Cloud::Spanner::V1::PartialResultSet>]
+        #   Raw enumerable from grpc `StreamingRead` call.
+        # @param service [::Google::Cloud::Spanner::Service] The `Spanner::Service` reference.
+        # @param session_name [::String] Required.
+        #   The session in which the transaction to be committed is running.
+        #   Values are of the form:
+        #   `projects/<project_id>/instances/<instance_id>/databases/<database_id>/sessions/<session_id>`.
+        # @param table [::String] The name of the table in the database that was read by `StreamingRead` request.
+        # @param columns [::Array<String, Symbol>] The columns of table that were returned
+        #   by the `StreamingRead` request.
+        # @param read_options [::Hash] Full request options
+        #   that were sent to the `service.streaming_read_table`. This hash joins params needed to
+        #   construct `::Gapic::CallOptions`, e.g. `call_options` and header-related `route_to_leader`
+        #   with params specific to `streaming_read_table`, such as `keys`.
         # @private
-        def self.from_read_response response, service, session_path, table, columns, read_options
-          from_enum(response, service).tap do |results|
-            results.instance_variable_set :@session_path, session_path
+        # @return [::Google::Cloud::Spanner::Results]
+        def self.from_read_response response, service, session_name, table, columns, read_options
+          from_partial_result_sets(response, service, session_name).tap do |results|
+            read_options_copy = read_options.dup
+            unless results.metadata.transaction.nil?
+              read_options_copy[:transaction] = V1::TransactionSelector.new id: results.metadata.transaction.id
+            end
+
             results.instance_variable_set :@table, table
             results.instance_variable_set :@columns, columns
-            results.instance_variable_set :@read_options, read_options
+            results.instance_variable_set :@read_options, read_options_copy
           end
         end