google-cloud-spanner 2.24.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe45aaee1d474b68ce2280271bd6d08756001451210dd35675405bc295c64385
-  data.tar.gz: 5de2b1c338ec90c0d8acc645f70a362ca7c79924bc65fd7ec575734f454a95cd
+  metadata.gz: cafab317421fcff06f127fb2d156c722f67b8e5d1914ae68d3e0ec8b56db4f76
+  data.tar.gz: 26820cba11c9d0a94d5dbaaff4c28ea0581c25ef3d7a9876d39ef5ca42fe5edc
 SHA512:
-  metadata.gz: 2a9190ee8a2c1b19465f6fe7ab46dfcb6bb757eb5500fe933d77e9d0fd6aef5f260c5c926553c07ca8f6360d0b23dd73bd9ed1f2541ce9626c5b2fdd8ee3e1a0
-  data.tar.gz: e040dfdd82111133d685455b7cb2ce49bc0bb8e9a669b513cd9988e6478fd15076ebb004e651e626a5548f644f58a6c67c7a4cc529d0a58e54bb0becb71f2186
+  metadata.gz: 58624fe569f909d5923f897fc02c6865c4861dd289ec5b1f58aead9ae01b87968ebd7b5e23d0305e4661011fd4bc2e3479cc08c08ef0c19b320daa2e68300fca
+  data.tar.gz: c011acec4ad559505de0b89e77dae6d2046f7e00768a421f4bd347ff25a3b8ee35673f1714037528e1d13572e054486ded0fd666d253df9b322a2c90ef19a1bf

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Release History
 
+### 2.26.0 (2025-03-24)
+
+#### Features
+
+* Support setting the universe domain ([#144](https://github.com/googleapis/ruby-spanner/issues/144)) 
+#### Bug Fixes
+
+* Corrected algorithm that releases stale sessions in the pool ([#156](https://github.com/googleapis/ruby-spanner/issues/156)) 
+
+### 2.25.0 (2025-01-29)
+
+#### Features
+
+* Support Protobuf Columns ([#124](https://github.com/googleapis/ruby-spanner/issues/124)) 
+* Update minimum Ruby version to 3.0 ([#140](https://github.com/googleapis/ruby-spanner/issues/140))
+
 ### 2.24.0 (2024-08-27)
 
 #### Features

data/CONTRIBUTING.md

@@ -24,7 +24,7 @@ be able to accept your pull requests.
 In order to use the google-cloud-spanner console and run the project's tests,
 there is a small amount of setup:
 
-1. Install Ruby. google-cloud-spanner requires Ruby 2.5+. You may choose to
+1. Install Ruby. google-cloud-spanner requires Ruby 3.0+. You may choose to
    manage your Ruby and gem installations with [RVM](https://rvm.io/),
    [rbenv](https://github.com/rbenv/rbenv), or
    [chruby](https://github.com/postmodern/chruby).

data/lib/google/cloud/spanner/admin/database.rb

@@ -85,6 +85,7 @@ module Google
           #
           def self.database_admin project_id: nil,
                                   credentials: nil,
+                                  universe_domain: nil,
                                   scope: nil,
                                   timeout: nil,
                                   endpoint: nil,
@@ -93,14 +94,23 @@ module Google
                                   emulator_host: nil,
                                   lib_name: nil,
                                   lib_version: nil
-            project_id    ||= project || default_project_id
-            scope         ||= configure.scope
-            timeout       ||= configure.timeout
+            project_id ||= project || default_project_id
+            scope ||= configure.scope
+            timeout ||= configure.timeout
             emulator_host ||= configure.emulator_host
-            endpoint      ||= emulator_host || configure.endpoint
-            credentials   ||= keyfile
-            lib_name      ||= configure.lib_name
-            lib_version   ||= configure.lib_version
+            # TODO: This logic is part of UniverseDomainConcerns in gapic-common
+            # but is being copied here because we need to determine the host up
+            # front in order to build a gRPC channel. We should refactor this
+            # somehow to allow this logic to live where it is supposed to.
+            universe_domain ||= configure.universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
+            endpoint ||= emulator_host || configure.endpoint
+            endpoint ||=
+              Google::Cloud::Spanner::Admin::Database::V1::DatabaseAdmin::Client::DEFAULT_ENDPOINT_TEMPLATE.sub(
+                Gapic::UniverseDomainConcerns::ENDPOINT_SUBSTITUTION, universe_domain
+              )
+            credentials ||= keyfile
+            lib_name ||= configure.lib_name
+            lib_version ||= configure.lib_version
 
             if emulator_host
               credentials = :this_channel_is_insecure
@@ -121,10 +131,11 @@ module Google
             configure.quota_project ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
             Admin::Database::V1::DatabaseAdmin::Client.new do |config|
+              config.universe_domain = universe_domain
               config.credentials = channel endpoint, credentials
               config.quota_project = configure.quota_project
               config.timeout = timeout if timeout
-              config.endpoint = endpoint if endpoint
+              config.endpoint = endpoint
               config.lib_name = lib_name_with_prefix lib_name, lib_version
               config.lib_version = Google::Cloud::Spanner::VERSION
               config.metadata = { "google-cloud-resource-prefix" => "projects/#{project_id}" }
@@ -290,7 +301,7 @@ module Google
           class Configuration
             extend ::Gapic::Config
 
-            config_attr :endpoint,      "spanner.googleapis.com", ::String
+            config_attr :endpoint,      nil, ::String
             config_attr :credentials,   nil do |value|
               allowed = [::String, ::Hash, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
               allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -307,6 +318,7 @@ module Google
             config_attr :query_options, nil, ::Hash,    nil
             config_attr :metadata,      nil, ::Hash,    nil
             config_attr :retry_policy,  nil, ::Hash,    nil
+            config_attr :universe_domain, nil, ::String, nil
 
             # @private
             def initialize parent_config = nil

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

@@ -85,6 +85,7 @@ module Google
           #
           def self.instance_admin project_id: nil,
                                   credentials: nil,
+                                  universe_domain: nil,
                                   scope: nil,
                                   timeout: nil,
                                   endpoint: nil,
@@ -93,14 +94,23 @@ module Google
                                   emulator_host: nil,
                                   lib_name: nil,
                                   lib_version: nil
-            project_id    ||= project || default_project_id
-            scope         ||= configure.scope
-            timeout       ||= configure.timeout
+            project_id ||= project || default_project_id
+            scope ||= configure.scope
+            timeout ||= configure.timeout
             emulator_host ||= configure.emulator_host
-            endpoint      ||= emulator_host || configure.endpoint
-            credentials   ||= keyfile
-            lib_name      ||= configure.lib_name
-            lib_version   ||= configure.lib_version
+            # TODO: This logic is part of UniverseDomainConcerns in gapic-common
+            # but is being copied here because we need to determine the host up
+            # front in order to build a gRPC channel. We should refactor this
+            # somehow to allow this logic to live where it is supposed to.
+            universe_domain ||= configure.universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
+            endpoint ||= emulator_host || configure.endpoint
+            endpoint ||=
+              Google::Cloud::Spanner::Admin::Instance::V1::InstanceAdmin::Client::DEFAULT_ENDPOINT_TEMPLATE.sub(
+                Gapic::UniverseDomainConcerns::ENDPOINT_SUBSTITUTION, universe_domain
+              )
+            credentials ||= keyfile
+            lib_name ||= configure.lib_name
+            lib_version ||= configure.lib_version
 
             if emulator_host
               credentials = :this_channel_is_insecure
@@ -121,10 +131,11 @@ module Google
             configure.quota_project ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 
             Admin::Instance::V1::InstanceAdmin::Client.new do |config|
+              config.universe_domain = universe_domain
               config.credentials = channel endpoint, credentials
               config.quota_project = configure.quota_project
               config.timeout = timeout if timeout
-              config.endpoint = endpoint if endpoint
+              config.endpoint = endpoint
               config.lib_name = lib_name_with_prefix lib_name, lib_version
               config.lib_version = Google::Cloud::Spanner::VERSION
               config.metadata = { "google-cloud-resource-prefix" => "projects/#{project_id}" }
@@ -290,7 +301,7 @@ module Google
           class Configuration
             extend ::Gapic::Config
 
-            config_attr :endpoint,      "spanner.googleapis.com", ::String
+            config_attr :endpoint,      nil, ::String
             config_attr :credentials,   nil do |value|
               allowed = [::String, ::Hash, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
               allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC
@@ -307,6 +318,7 @@ module Google
             config_attr :query_options, nil, ::Hash,    nil
             config_attr :metadata,      nil, ::Hash,    nil
             config_attr :retry_policy,  nil, ::Hash,    nil
+            config_attr :universe_domain, nil, ::String, nil
 
             # @private
             def initialize parent_config = nil

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

@@ -156,7 +156,7 @@ module Google
             # object. Operation object is a backup operation.
             #
             def self.from_grpc grpc, service
-              operations_client = \
+              operations_client =
                 service.databases.instance_variable_get "@operations_client"
               jobs = new(Array(grpc.response.operations).map do |job_grpc|
                 Job.from_grpc \

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

@@ -1022,10 +1022,10 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
-        #
         # @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`.
@@ -1169,6 +1169,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -1314,6 +1315,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -1460,6 +1462,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).

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

@@ -76,6 +76,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -93,19 +94,7 @@ module Google
         #   end
         #
         def upsert table, *rows
-          rows = Array(rows).flatten
-          return rows if rows.empty?
-          rows.compact
-          rows.delete_if(&:empty?)
-          @mutations += rows.map do |row|
-            V1::Mutation.new(
-              insert_or_update: V1::Mutation::Write.new(
-                table: table, columns: row.keys.map(&:to_s),
-                values: [Convert.object_to_grpc_value(row.values).list_value]
-              )
-            )
-          end
-          rows
+          mutations_from_rows table, rows, "insert_or_update"
         end
         alias save upsert
 
@@ -136,6 +125,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -153,19 +143,7 @@ module Google
         #   end
         #
         def insert table, *rows
-          rows = Array(rows).flatten
-          return rows if rows.empty?
-          rows.compact
-          rows.delete_if(&:empty?)
-          @mutations += rows.map do |row|
-            V1::Mutation.new(
-              insert: V1::Mutation::Write.new(
-                table: table, columns: row.keys.map(&:to_s),
-                values: [Convert.object_to_grpc_value(row.values).list_value]
-              )
-            )
-          end
-          rows
+          mutations_from_rows table, rows, "insert"
         end
 
         ##
@@ -195,6 +173,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -212,19 +191,7 @@ module Google
         #   end
         #
         def update table, *rows
-          rows = Array(rows).flatten
-          return rows if rows.empty?
-          rows.compact
-          rows.delete_if(&:empty?)
-          @mutations += rows.map do |row|
-            V1::Mutation.new(
-              update: V1::Mutation::Write.new(
-                table: table, columns: row.keys.map(&:to_s),
-                values: [Convert.object_to_grpc_value(row.values).list_value]
-              )
-            )
-          end
-          rows
+          mutations_from_rows table, rows, "update"
         end
 
         ##
@@ -256,6 +223,7 @@ module Google
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
@@ -273,19 +241,7 @@ module Google
         #   end
         #
         def replace table, *rows
-          rows = Array(rows).flatten
-          return rows if rows.empty?
-          rows.compact
-          rows.delete_if(&:empty?)
-          @mutations += rows.map do |row|
-            V1::Mutation.new(
-              replace: V1::Mutation::Write.new(
-                table: table, columns: row.keys.map(&:to_s),
-                values: [Convert.object_to_grpc_value(row.values).list_value]
-              )
-            )
-          end
-          rows
+          mutations_from_rows table, rows, "replace"
         end
 
         ##
@@ -330,6 +286,42 @@ module Google
 
         protected
 
+        ##
+        # @private
+        # Generates mutations from `rows` to be performed on a given table, converting
+        # given rows to their corresponding column and gRPC values.
+        #
+        # @param [String] table The name of the table in the database to be
+        #   modified.
+        # @param [Array<Hash>] rows One or more hash objects with the hash keys
+        #   matching the table's columns, and the hash values matching the
+        #   table's values.
+        # @param [String] type The type of mutation to be performed.
+        #
+        def mutations_from_rows table, rows, type
+          rows = Array(rows).flatten
+          return rows if rows.empty?
+          rows.compact
+          rows.delete_if { |row| row.respond_to?(:empty?) && row.empty? }
+          @mutations += rows.map do |row|
+            # This case applies whenever a Protobuf object is the row itself, and not part of individual column fields.
+            if row.class.respond_to? :descriptor
+              columns = row.class.descriptor.map(&:name)
+              values = [Google::Protobuf::ListValue.new(values: [Convert.object_to_grpc_value(row, :PROTO)])]
+            else
+              columns = row.keys.map(&:to_s)
+              values = [Convert.object_to_grpc_value(row.values).list_value]
+            end
+            V1::Mutation.new(
+              "#{type}": V1::Mutation::Write.new(
+                table: table, columns: columns,
+                values: values
+              )
+            )
+          end
+          rows
+        end
+
         def key_set keys
           return V1::KeySet.new all: true if keys.nil?
           keys = [keys] unless keys.is_a? Array

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

@@ -45,9 +45,16 @@ module Google
             end
 
             field ||= field_for_object obj
-            [object_to_grpc_value(obj, field), grpc_type_for_field(field)]
+            [object_to_grpc_value(obj, field), grpc_type_for_field(field, obj)]
           end
 
+          ##
+          # @private
+          # Convert objects to their corresponding gRPC values.
+          #
+          # `field` is used to determine whether the object itself is a value or
+          # a collection of values.
+          #
           def object_to_grpc_value obj, field = nil
             obj = obj.to_column_value if obj.respond_to? :to_column_value
 
@@ -101,12 +108,17 @@ module Google
               else
                 Google::Protobuf::Value.new string_value: obj.to_json
               end
+            when Google::Protobuf::MessageExts
+              proto_class = obj.class
+              content = proto_class.encode obj
+              encoded_content = Base64.strict_encode64(content)
+              Google::Protobuf::Value.new string_value: encoded_content
             else
               if obj.respond_to?(:read) && obj.respond_to?(:rewind)
                 obj.rewind
                 content = obj.read.force_encoding("ASCII-8BIT")
                 encoded_content = Base64.strict_encode64(content)
-                Google::Protobuf::Value.new(string_value: encoded_content)
+                Google::Protobuf::Value.new string_value: encoded_content
               else
                 raise ArgumentError,
                       "A value of type #{obj.class} is not supported."
@@ -161,6 +173,8 @@ module Google
               Fields.new Hash[raw_type_pairs]
             when Data
               obj.fields
+            when Google::Protobuf::MessageExts
+              :PROTO
             else
               if obj.respond_to?(:read) && obj.respond_to?(:rewind)
                 :BYTES
@@ -171,7 +185,7 @@ module Google
             end
           end
 
-          def grpc_type_for_field field
+          def grpc_type_for_field field, obj = nil
             return field.to_grpc_type if field.respond_to? :to_grpc_type
 
             case field
@@ -184,11 +198,20 @@ module Google
               V1::Type.new(code: :NUMERIC, type_annotation: :PG_NUMERIC)
             when :PG_JSONB
               V1::Type.new(code: :JSON, type_annotation: :PG_JSONB)
+            when :PROTO
+              V1::Type.new(code: :PROTO, proto_type_fqn: obj.nil? ? "" : obj.class.descriptor.name)
             else
               V1::Type.new(code: field)
             end
           end
 
+          ##
+          # Converts a gRPC value to a Ruby object.
+          #
+          # @param [Google::Protobuf::Value] value The gRPC value to convert.
+          # @param [Google::Spanner::V1::Type] type The underlying type for data.
+          # @return [::Object] The Ruby object that represents the value, converted to the closest
+          #   matching Ruby class based on the gRPC type.
           def grpc_value_to_object value, type
             return nil if value.kind == :null_value
 
@@ -229,6 +252,10 @@ module Google
               BigDecimal value.string_value
             when :JSON
               JSON.parse value.string_value
+            when :PROTO
+              descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(type.proto_type_fqn).msgclass
+              content = Base64.decode64 value.string_value
+              descriptor.decode content
             end
           end
 

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

@@ -156,7 +156,7 @@ module Google
             # object. Operation object is a database operation.
             #
             def self.from_grpc grpc, service
-              operations_client = \
+              operations_client =
                 service.databases.instance_variable_get "@operations_client"
               jobs = new(Array(grpc.response.operations).map do |job_grpc|
                 Job.from_grpc \

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

@@ -238,6 +238,10 @@ module Google
         #   valid identifier: `[a-z][a-z0-9_]*`. Will raise
         #   {Google::Cloud::AlreadyExistsError} if the named operation already
         #   exists. Optional.
+        # @param [Google::Protobuf::FileDescriptorSet, String] descriptor_set The file
+        #   descriptor set object to be used in the update, or alternatively, an absolute
+        #   path to the generated file descriptor set. The descriptor set is only used
+        #   during DDL statements, such as `CREATE PROTO BUNDLE`.
         #
         # @return [Database::Job] The job representing the long-running,
         #   asynchronous processing of a database schema update operation.
@@ -248,22 +252,48 @@ module Google
         #   spanner = Google::Cloud::Spanner.new
         #   database = spanner.database "my-instance", "my-database"
         #
-        #   add_users_table_sql = %q(
-        #     CREATE TABLE users (
-        #       id INT64 NOT NULL,
-        #       username STRING(25) NOT NULL,
-        #       name STRING(45) NOT NULL,
-        #       email STRING(128),
-        #     ) PRIMARY KEY(id)
-        #   )
+        #   add_users_table_sql =
+        #     <<~SQL
+        #       CREATE TABLE users (
+        #         id INT64 NOT NULL,
+        #         username STRING(25) NOT NULL,
+        #         name STRING(45) NOT NULL,
+        #         email STRING(128),
+        #       ) PRIMARY KEY(id)
+        #     SQL
         #
         #   database.update statements: [add_users_table_sql]
         #
-        def update statements: [], operation_id: nil
+        # @example
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   database = spanner.database "my-instance", "my-database"
+        #
+        #   create_proto_bundle_sql =
+        #     <<~SQL
+        #       CREATE PROTO BUNDLE (
+        #         `examples.User`
+        #       )
+        #     SQL
+        #
+        #   create_users_table_sql =
+        #     <<~SQL
+        #       CREATE TABLE users (
+        #         id INT64 NOT NULL,
+        #         user `examples.User` NOT NULL
+        #       ) PRIMARY KEY (id)
+        #     SQL
+        #
+        #   database.update statements: [create_proto_bundle_sql, create_users_table_sql],
+        #                   descriptor_set: "/usr/local/user_descriptors.pb"
+        #
+        def update statements: [], operation_id: nil, descriptor_set: nil
           ensure_service!
           grpc = service.update_database_ddl instance_id, database_id,
                                              statements: statements,
-                                             operation_id: operation_id
+                                             operation_id: operation_id,
+                                             descriptor_set: descriptor_set
           Database::Job.from_grpc grpc, service
         end
 

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

@@ -68,6 +68,7 @@ module Google
         #   * `:INT64`
         #   * `:STRING`
         #   * `:TIMESTAMP`
+        #   * `:PROTO`
         #   * `Array` - Lists are specified by providing the type code in an
         #     array. For example, an array of integers are specified as
         #     `[:INT64]`.
@@ -275,24 +276,23 @@ module Google
             return Data.from_grpc nil, @grpc_fields
           elsif data.is_a? Array
             # Convert data in the order it was recieved
-            values = data.map.with_index do |datum, index|
-              Convert.object_to_grpc_value_and_type(datum, cached_types[index]).first
+            values_and_types = data.map.with_index do |datum, index|
+              Convert.object_to_grpc_value_and_type(datum, cached_types[index])
             end
-            return Data.from_grpc values, @grpc_fields
           elsif data.is_a? Hash
             # Pull values from hash in order of the fields,
             # we can't always trust the Hash to be in order.
-            values = @grpc_fields.map.with_index do |field, index|
+            values_and_types = @grpc_fields.map.with_index do |field, index|
               if data.key? index
                 Convert.object_to_grpc_value_and_type(data[index],
-                                              cached_types[index]).first
+                                              cached_types[index])
               elsif !field.name.to_s.empty?
                 if data.key? field.name.to_s
                   Convert.object_to_grpc_value_and_type(data[field.name.to_s],
-                                                cached_types[index]).first
+                                                cached_types[index])
                 elsif data.key? field.name.to_s.to_sym
                   Convert.object_to_grpc_value_and_type(data[field.name.to_s.to_sym],
-                                                cached_types[index]).first
+                                                cached_types[index])
                 else
                   raise "data value for field #{field.name} missing"
                 end
@@ -300,9 +300,18 @@ module Google
                 raise "data value for field #{index} missing"
               end
             end
-            return Data.from_grpc values, @grpc_fields
+          else
+            raise ArgumentError, "can only accept Array or Hash"
+          end
+
+          # This is not ideal since we loop through `@grpc_fields` a second time after
+          # initialization. Refactoring can be done to perform this step later on when
+          # all information for the type is available.
+          values, grpc_types = values_and_types.transpose
+          grpc_types&.each_with_index do |grpc_type, index|
+            @grpc_fields[index].type = grpc_type
           end
-          raise ArgumentError, "can only accept Array or Hash"
+          Data.from_grpc values, @grpc_fields
         end
         alias data struct
         alias new struct

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

@@ -173,7 +173,7 @@ module Google
           # TODO: raise if hash[:execute_query].nil? && hash[:read].nil?
           new.tap do |p|
             if data[:execute]
-              execute_sql_grpc = \
+              execute_sql_grpc =
                 V1::ExecuteSqlRequest.decode(
                   Base64.decode64(data[:execute])
                 )

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

@@ -136,10 +136,10 @@ module Google
 
           @mutex.synchronize do
             available_count = sessions_available.count
-            release_count = @min - available_count
+            release_count = available_count - @min
             release_count = 0 if release_count.negative?
 
-            to_keepalive += sessions_available.select do |x|
+            to_keepalive = sessions_available.select do |x|
               x.idle_since? @keepalive
             end
 

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

@@ -95,6 +95,15 @@ module Google
         end
         alias project project_id
 
+        ##
+        # The universe domain the client is connected to
+        #
+        # @return [String]
+        #
+        def universe_domain
+          service.universe_domain
+        end
+
         ##
         # Retrieves the list of Cloud Spanner instances for the project.
         #

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

@@ -38,6 +38,8 @@ module Google
         attr_accessor :quota_project
         attr_accessor :enable_leader_aware_routing
 
+        attr_reader :universe_domain
+
         RST_STREAM_INTERNAL_ERROR = "Received RST_STREAM".freeze
         EOS_INTERNAL_ERROR = "Received unexpected EOS on DATA frame from server".freeze
 
@@ -45,11 +47,19 @@ module Google
         # Creates a new Service instance.
         def initialize project, credentials, quota_project: nil,
                        host: nil, timeout: nil, lib_name: nil, lib_version: nil,
-                       enable_leader_aware_routing: nil
+                       enable_leader_aware_routing: nil, universe_domain: nil
           @project = project
           @credentials = credentials
           @quota_project = quota_project || (credentials.quota_project_id if credentials.respond_to? :quota_project_id)
-          @host = host
+          # TODO: This logic is part of UniverseDomainConcerns in gapic-common
+          # but is being copied here because we need to determine the host up
+          # front in order to build a gRPC channel. We should refactor this
+          # somehow to allow this logic to live where it is supposed to.
+          @universe_domain = universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
+          @host = host ||
+                  Google::Cloud::Spanner::V1::Spanner::Client::DEFAULT_ENDPOINT_TEMPLATE.sub(
+                    Gapic::UniverseDomainConcerns::ENDPOINT_SUBSTITUTION, @universe_domain
+                  )
           @timeout = timeout
           @lib_name = lib_name
           @lib_version = lib_version
@@ -74,12 +84,13 @@ module Google
 
         def service
           return mocked_service if mocked_service
-          @service ||= \
+          @service ||=
             V1::Spanner::Client.new do |config|
               config.credentials = channel
               config.quota_project = @quota_project
               config.timeout = timeout if timeout
               config.endpoint = host if host
+              config.universe_domain = @universe_domain
               config.lib_name = lib_name_with_prefix
               config.lib_version = Google::Cloud::Spanner::VERSION
               config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
@@ -89,12 +100,13 @@ module Google
 
         def instances
           return mocked_instances if mocked_instances
-          @instances ||= \
+          @instances ||=
             Admin::Instance::V1::InstanceAdmin::Client.new do |config|
               config.credentials = channel
               config.quota_project = @quota_project
               config.timeout = timeout if timeout
               config.endpoint = host if host
+              config.universe_domain = @universe_domain
               config.lib_name = lib_name_with_prefix
               config.lib_version = Google::Cloud::Spanner::VERSION
               config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
@@ -104,12 +116,13 @@ module Google
 
         def databases
           return mocked_databases if mocked_databases
-          @databases ||= \
+          @databases ||=
             Admin::Database::V1::DatabaseAdmin::Client.new do |config|
               config.credentials = channel
               config.quota_project = @quota_project
               config.timeout = timeout if timeout
               config.endpoint = host if host
+              config.universe_domain = @universe_domain
               config.lib_name = lib_name_with_prefix
               config.lib_version = Google::Cloud::Spanner::VERSION
               config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
@@ -257,12 +270,27 @@ module Google
         end
 
         def update_database_ddl instance_id, database_id, statements: [],
-                                operation_id: nil, call_options: nil
+                                operation_id: nil, call_options: nil, descriptor_set: nil
+          bin_data =
+            case descriptor_set
+            when Google::Protobuf::FileDescriptorSet
+              Google::Protobuf::FileDescriptorSet.encode descriptor_set
+            when String
+              File.binread descriptor_set
+            when NilClass
+              nil
+            else
+              raise ArgumentError,
+                    "A value of type #{descriptor_set.class} is not supported."
+            end
+
+          proto_descriptors = bin_data unless bin_data.nil?
           opts = default_options call_options: call_options
           request = {
             database: database_path(instance_id, database_id),
             statements: Array(statements),
-            operation_id: operation_id
+            operation_id: operation_id,
+            proto_descriptors: proto_descriptors
           }
           databases.update_database_ddl request, opts
         end

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

@@ -125,6 +125,7 @@ module Google
         #   | `BYTES`     | `File`, `IO`, `StringIO`, or similar | |
         #   | `ARRAY`     | `Array` | Nested arrays are not supported. |
         #   | `STRUCT`    | `Hash`, {Data} | |
+        #   | `PROTO`     | Determined by proto_fqn | |
         #
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).

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

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

data/lib/google/cloud/spanner.rb

@@ -84,6 +84,7 @@ module Google
       #   with version.
       # @param enable_leader_aware_routing [Boolean] Specifies whether Leader
       #   Aware Routing should be enabled. Defaults to true.
+      # @param universe_domain [String] A custom universe domain. Optional.
       #
       # @return [Google::Cloud::Spanner::Project]
       #
@@ -95,7 +96,7 @@ module Google
       def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
                    endpoint: nil, project: nil, keyfile: nil,
                    emulator_host: nil, lib_name: nil, lib_version: nil,
-                   enable_leader_aware_routing: true
+                   enable_leader_aware_routing: true, universe_domain: nil
         project_id    ||= project || default_project_id
         scope         ||= configure.scope
         timeout       ||= configure.timeout
@@ -104,6 +105,7 @@ module Google
         credentials   ||= keyfile
         lib_name      ||= configure.lib_name
         lib_version   ||= configure.lib_version
+        universe_domain ||= configure.universe_domain
 
         if emulator_host
           credentials = :this_channel_is_insecure
@@ -125,7 +127,7 @@ module Google
           Spanner::Service.new(
             project_id, credentials, quota_project: configure.quota_project,
             host: endpoint, timeout: timeout, lib_name: lib_name,
-            lib_version: lib_version,
+            lib_version: lib_version, universe_domain: universe_domain,
             enable_leader_aware_routing: enable_leader_aware_routing
           ),
           query_options: configure.query_options

data/lib/google-cloud-spanner.rb

@@ -139,10 +139,8 @@ module Google
   end
 end
 
-# rubocop:disable Metrics/BlockLength
-
 # Set the default spanner configuration
-Google::Cloud.configure.add_config! :spanner do |config|
+Google::Cloud.configure.add_config! :spanner do |config| # rubocop:disable Metrics/BlockLength
   default_project = Google::Cloud::Config.deferred do
     ENV["SPANNER_PROJECT"]
   end
@@ -181,11 +179,10 @@ Google::Cloud.configure.add_config! :spanner do |config|
   config.add_field! :scope, default_scopes, match: [String, Array]
   config.add_field! :quota_project, nil, match: String
   config.add_field! :timeout, nil, match: Integer
-  config.add_field! :endpoint, "spanner.googleapis.com", match: String
+  config.add_field! :endpoint, nil, match: String
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :lib_name, nil, match: String, allow_nil: true
   config.add_field! :lib_version, nil, match: String, allow_nil: true
   config.add_field! :query_options, default_query_options, match: Hash, allow_nil: true
+  config.add_field! :universe_domain, nil, match: String, allow_nil: true
 end
-
-# rubocop:enable Metrics/BlockLength

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Mike Moore
 - Chris Smith
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -45,74 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner-admin-database-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner-admin-instance-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.a
+        version: '1.6'
 description: google-cloud-spanner is the official library for Google Cloud Spanner
   API.
 email:
@@ -187,7 +168,6 @@ homepage: https://github.com/googleapis/ruby-spanner/blob/main/google-cloud-span
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -195,15 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: API Client library for Google Cloud Spanner API
 test_files: []