activerecord-spanner-adapter 2.6.0 → 2.7.0

data/lib/active_record/connection_adapters/spanner/quoting.rb

@@ -1,25 +1,3 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2020 Google LLC.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# ITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
 # Copyright 2020 Google LLC
 #
 # Use of this source code is governed by an MIT-style

data/lib/active_record/connection_adapters/spanner/schema_creation.rb

@@ -21,23 +21,11 @@ module ActiveRecord
           create_sql = +"CREATE TABLE #{quote_table_name o.name} "
           statements = o.columns.map { |c| accept c }
 
-          if ActiveRecord::VERSION::MAJOR >= 7
-            o.foreign_keys.each do |fk|
-              statements << accept(fk)
-            end
-          else
-            o.foreign_keys.each do |to_table, options|
-              statements << foreign_key_in_create(o.name, to_table, options)
-            end
+          o.foreign_keys.each do |fk|
+            statements << accept(fk)
           end
 
-          if ActiveRecord::VERSION::MAJOR >= 7
-            statements.concat(o.check_constraints.map { |chk| accept chk })
-          elsif ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR >= 1
-            statements.concat(
-              o.check_constraints.map { |expression, options| check_constraint_in_create o.name, expression, options }
-            )
-          end
+          statements.concat(o.check_constraints.map { |chk| accept chk })
 
           create_sql << "(#{statements.join ', '}) " if statements.any?
 

data/lib/active_record/connection_adapters/spanner/schema_statements.rb

@@ -473,10 +473,6 @@ module ActiveRecord
           TableDefinition.new self, args[0], options: args[1]
         end
 
-        def able_to_ddl_batch? table_name
-          [ActiveRecord::InternalMetadata.table_name, ActiveRecord::SchemaMigration.table_name].exclude? table_name.to_s
-        end
-
         def _change_column table_name, column_name, type, **options # rubocop:disable Metrics/AbcSize
           column = information_schema do |i|
             i.table_column table_name, column_name

data/lib/active_record/connection_adapters/spanner_adapter.rb

@@ -208,6 +208,10 @@ module ActiveRecord
         true
       end
 
+      def supports_savepoints?
+        false
+      end
+
       # Generate next sequence number for primary key
       def next_sequence_value _sequence_name
         SecureRandom.uuid.gsub("-", "").hex & 0x7FFFFFFFFFFFFFFF
@@ -278,29 +282,23 @@ module ActiveRecord
         end
       end
 
-      if ActiveRecord::VERSION::MAJOR >= 7
-        class << self
-          include TypeMapBuilder
-        end
+      class << self
+        include TypeMapBuilder
+      end
 
-        TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map m }
+      TYPE_MAP = Type::TypeMap.new.tap { |m| initialize_type_map m }
 
-        private
+      private
 
-        def type_map
-          TYPE_MAP
-        end
-      else
-        include TypeMapBuilder
+      def type_map
+        TYPE_MAP
       end
 
       def transform sql
         if ActiveRecord::VERSION::MAJOR >= 8
           preprocess_query sql
-        elsif ActiveRecord::VERSION::MAJOR == 7
-          transform_query sql
         else
-          sql
+          transform_query sql
         end
       end
 

data/lib/active_record/type/spanner/spanner_active_record_converter.rb

@@ -6,10 +6,34 @@
 
 # frozen_string_literal: true
 
+require "active_record/type/spanner/array"
+require "active_record/type/spanner/bytes"
+require "active_record/type/spanner/time"
+require "active_record/type/spanner/uuid"
+
 module ActiveRecord
   module Type
     module Spanner
       class SpannerActiveRecordConverter
+        TYPE_MAP = {
+          ActiveModel::Type::Integer => :INT64,
+          ActiveModel::Type::BigInteger => :INT64,
+          ActiveModel::Type::Boolean => :BOOL,
+          ActiveModel::Type::String => :STRING,
+          ActiveModel::Type::ImmutableString => :STRING,
+          ActiveModel::Type::Binary => :BYTES,
+          ActiveRecord::Type::Spanner::Bytes => :BYTES,
+          ActiveModel::Type::Float => :FLOAT64,
+          ActiveModel::Type::Decimal => :NUMERIC,
+          ActiveModel::Type::DateTime => :TIMESTAMP,
+          ActiveModel::Type::Time => :TIMESTAMP,
+          ActiveRecord::Type::Spanner::Time => :TIMESTAMP,
+          ActiveModel::Type::Date => :DATE,
+          ActiveRecord::Type::Json => :JSON,
+          ActiveRecord::Type::Spanner::Uuid => :UUID
+        }.freeze
+        private_constant :TYPE_MAP
+
         def self.serialize_with_transaction_isolation_level type, value, isolation_level
           if type.respond_to? :serialize_with_isolation_level
             type.serialize_with_isolation_level value, isolation_level
@@ -22,12 +46,19 @@ module ActiveRecord
 
         ##
         # Converts an ActiveModel::Type to a Spanner type code.
-        def self.convert_active_model_type_to_spanner type # rubocop:disable Metrics/CyclomaticComplexity
+        def self.convert_active_model_type_to_spanner type
+          return nil if type.nil?
+
           # Unwrap the underlying object if the type is a DelegateClass.
           type = type.__getobj__ if type.respond_to? :__getobj__
 
+          TYPE_MAP[type.class] || fallback_convert_active_model_type_to_spanner(type)
+        end
+
+        def self.fallback_convert_active_model_type_to_spanner type # rubocop:disable Metrics/CyclomaticComplexity
           case type
           when NilClass then nil
+          when ActiveRecord::Type::Spanner::Array then [convert_active_model_type_to_spanner(type.element_type)]
           when ActiveModel::Type::Integer, ActiveModel::Type::BigInteger then :INT64
           when ActiveModel::Type::Boolean then :BOOL
           when ActiveModel::Type::String, ActiveModel::Type::ImmutableString then :STRING
@@ -38,9 +69,9 @@ module ActiveRecord
           when ActiveModel::Type::Date then :DATE
           when ActiveRecord::Type::Json then :JSON
           when ActiveRecord::Type::Spanner::Uuid then :UUID
-          when ActiveRecord::Type::Spanner::Array then [convert_active_model_type_to_spanner(type.element_type)]
           end
         end
+        private_class_method :fallback_convert_active_model_type_to_spanner
       end
     end
   end

data/lib/activerecord_spanner_adapter/base.rb

@@ -8,14 +8,7 @@ require "active_record/gem_version"
 require "activerecord_spanner_adapter/relation"
 
 module ActiveRecord
-  class TableMetadata # :nodoc:
-    # This attr_reader is private in ActiveRecord 6.0.x and public in 6.1.x. This makes sure it is always available in
-    # the Spanner adapter.
-    attr_reader :arel_table
-  end
-
   class Base
-    VERSION_7_1 = Gem::Version.create "7.1.0"
     VERSION_7_2 = Gem::Version.create "7.2.0"
 
     # Creates an object (or multiple objects) and saves it to the database. This method will use mutations instead
@@ -88,7 +81,6 @@ module ActiveRecord
       end
 
       if _should_use_standard_insert_record? values
-        return super values if ActiveRecord.gem_version < VERSION_7_1
         return super
       end
 
@@ -108,12 +100,8 @@ module ActiveRecord
 
     def self._insert_record_dml values, returning
       primary_key_value = _set_primary_key_value values, false
-      if ActiveRecord::VERSION::MAJOR >= 7
-        im = Arel::InsertManager.new arel_table
-        im.insert(values.transform_keys { |name| arel_table[name] })
-      else
-        im = arel_table.compile_insert _substitute_values(values)
-      end
+      im = Arel::InsertManager.new arel_table
+      im.insert(values.transform_keys { |name| arel_table[name] })
       result = connection.insert(im, "#{self} Create", primary_key || false, primary_key_value)
 
       _convert_primary_key result, returning
@@ -131,7 +119,6 @@ module ActiveRecord
       # Rails 7.1 and higher supports composite primary keys, and therefore require the provider to return an array
       # instead of a single value in all cases. The order of the values should be equal to the order of the returning
       # columns (or the primary key if no returning columns were specified).
-      return primary_key_value if ActiveRecord.gem_version < VERSION_7_1
       return primary_key_value if primary_key_value.is_a?(Array) && primary_key_value.length == 1
       return [primary_key_value] unless primary_key_value.is_a? Array
 
@@ -270,12 +257,7 @@ module ActiveRecord
         value = next_sequence_value
       end
 
-      values[primary_key] =
-        if ActiveRecord::VERSION::MAJOR >= 7
-          ActiveModel::Attribute.from_database primary_key, value, type
-        else
-          value
-        end
+      values[primary_key] = ActiveModel::Attribute.from_database primary_key, value, type
 
       value
     end
@@ -289,12 +271,8 @@ module ActiveRecord
 
       if primary_key_value.nil?
         primary_key_value = next_sequence_value
-        if ActiveRecord::VERSION::MAJOR >= 7
-          values[primary_key] = ActiveModel::Attribute.from_database primary_key, primary_key_value,
-                                                                     ActiveModel::Type::BigInteger.new
-        else
-          values[primary_key] = primary_key_value
-        end
+        values[primary_key] = ActiveModel::Attribute.from_database primary_key, primary_key_value,
+                                                                   ActiveModel::Type::BigInteger.new
       end
 
       primary_key_value

data/lib/activerecord_spanner_adapter/connection.rb

@@ -459,25 +459,5 @@ module ActiveRecordSpannerAdapter
       raise
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-
-    ##
-    # Retrieves the delay value from Google::Cloud::AbortedError or
-    # GRPC::Aborted
-    def delay_from_aborted err
-      return nil if err.nil?
-      if err.respond_to?(:metadata) && err.metadata["google.rpc.retryinfo-bin"]
-        retry_info = Google::Rpc::RetryInfo.decode err.metadata["google.rpc.retryinfo-bin"]
-        seconds = retry_info["retry_delay"].seconds
-        nanos = retry_info["retry_delay"].nanos
-        return seconds if nanos.zero?
-        return seconds + (nanos / 1_000_000_000.0)
-      end
-      # No metadata? Try the inner error
-      delay_from_aborted err.cause
-    rescue StandardError
-      # Any error indicates the backoff should be handled elsewhere
-      nil
-    end
   end
 end

data/lib/activerecord_spanner_adapter/information_schema.rb

@@ -15,13 +15,10 @@ module ActiveRecordSpannerAdapter
   class InformationSchema
     include ActiveRecord::ConnectionAdapters::Quoting
 
-    IsRails71OrLater = ActiveRecord.gem_version >= Gem::Version.create("7.1.0")
-
     attr_reader :connection
 
     def initialize connection
       @connection = connection
-      @mutex = Mutex.new
     end
 
     def tables table_name: nil, schema_name: "", view: nil
@@ -128,7 +125,7 @@ module ActiveRecordSpannerAdapter
     # ActiveRecord. The parent primary key columns are filtered out by default to allow interleaved tables to be
     # considered as tables with a single-column primary key by ActiveRecord. The actual primary key of the table will
     # include both the parent primary key columns and the 'own' primary key columns of a table.
-    def table_primary_keys table_name, include_parent_keys = IsRails71OrLater, schema_name: ""
+    def table_primary_keys table_name, include_parent_keys = true, schema_name: "" # rubocop:disable Style/OptionalBooleanParameter
       sql = +"WITH TABLE_PK_COLS AS ( "
       sql << "SELECT C.TABLE_CATALOG, C.TABLE_SCHEMA, C.TABLE_NAME, C.COLUMN_NAME, "
       sql << "C.INDEX_NAME, C.COLUMN_ORDERING, C.ORDINAL_POSITION "

data/lib/activerecord_spanner_adapter/table.rb

@@ -1,25 +1,3 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2020 Google LLC.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# ITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
 # Copyright 2020 Google LLC
 #
 # Use of this source code is governed by an MIT-style

data/lib/activerecord_spanner_adapter/version.rb

@@ -5,5 +5,5 @@
 # https://opensource.org/licenses/MIT.
 
 module ActiveRecordSpannerAdapter
-  VERSION = "2.6.0".freeze
+  VERSION = "2.7.0".freeze
 end

data/lib/arel/visitors/spanner.rb

@@ -5,6 +5,14 @@
 # https://opensource.org/licenses/MIT.
 
 module Arel # :nodoc: all
+  module Collectors
+    class SQLString
+      attr_accessor :hints
+      attr_accessor :table_hints
+      attr_accessor :join_hints
+    end
+  end
+
   module Visitors
     class StalenessHint
       attr_reader :value
@@ -24,9 +32,9 @@ module Arel # :nodoc: all
 
     class Spanner < Arel::Visitors::ToSql
       def compile node, collector = Arel::Collectors::SQLString.new
-        collector.class.module_eval { attr_accessor :hints }
-        collector.class.module_eval { attr_accessor :table_hints }
-        collector.class.module_eval { attr_accessor :join_hints }
+        unless collector.respond_to? :hints=
+          collector.class.attr_accessor :hints, :table_hints, :join_hints
+        end
         collector.hints = {}
         collector.table_hints = {}
         collector.join_hints = {}
@@ -137,7 +145,7 @@ module Arel # :nodoc: all
         end
       end
 
-      # For ActiveRecord 7.0
+      # For ActiveRecord 7.1+
       def visit_ActiveModel_Attribute o, collector
         # Do not generate a query parameter if the value should be set to the PENDING_COMMIT_TIMESTAMP(), as that is
         # not supported as a parameter value by Cloud Spanner.
@@ -145,17 +153,6 @@ module Arel # :nodoc: all
           if o.type.is_a?(ActiveRecord::Type::Spanner::Time) && o.value == :commit_timestamp
         collector.add_bind(o, &bind_block)
       end
-
-      # For ActiveRecord 6.x
-      def visit_Arel_Nodes_BindParam o, collector
-        # Do not generate a query parameter if the value should be set to the PENDING_COMMIT_TIMESTAMP(), as that is
-        # not supported as a parameter value by Cloud Spanner.
-        return collector << "PENDING_COMMIT_TIMESTAMP()" \
-            if o.value.respond_to?(:type) \
-              && o.value.type.is_a?(ActiveRecord::Type::Spanner::Time) \
-              && o.value.value == :commit_timestamp
-        collector.add_bind(o.value, &bind_block)
-      end
       # rubocop:enable Naming/MethodName
     end
   end

data/lib/spanner_client_ext.rb

@@ -4,6 +4,7 @@
 # license that can be found in the LICENSE file or at
 # https://opensource.org/licenses/MIT.
 
+require "google/cloud/spanner"
 
 module Google
   module Cloud
@@ -23,6 +24,10 @@ module Google
       end
 
       class Session
+        def self.snapshot_from_grpc_arity
+          @snapshot_from_grpc_arity ||= Snapshot.method(:from_grpc).arity
+        end
+
         def commit_transaction transaction, mutations = [], commit_options: nil
           ensure_service!
 
@@ -69,8 +74,7 @@ module Google
           snp_grpc = service.create_snapshot \
             path, timestamp: timestamp || read_timestamp,
             staleness: staleness || exact_staleness
-          num_args = Snapshot.method(:from_grpc).arity
-          if num_args == 3
+          if Session.snapshot_from_grpc_arity == 3
             Snapshot.from_grpc snp_grpc, self, nil
           else
             Snapshot.from_grpc snp_grpc, self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Google LLC
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -53,10 +53,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: autotest-suffix
   requirement: !ruby/object:Gem::Requirement
@@ -261,10 +275,12 @@ files:
 - ".toys/release.rb"
 - ".trampolinerc"
 - ".yardopts"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -273,7 +289,6 @@ files:
 - acceptance/cases/associations/has_many_through_associations_test.rb
 - acceptance/cases/associations/has_one_associations_test.rb
 - acceptance/cases/associations/has_one_through_associations_test.rb
-- acceptance/cases/interleaved_associations/has_many_associations_using_interleaved_test.rb
 - acceptance/cases/migration/change_schema_test.rb
 - acceptance/cases/migration/change_table_test.rb
 - acceptance/cases/migration/column_attributes_test.rb
@@ -294,13 +309,11 @@ files:
 - acceptance/cases/models/default_value_test.rb
 - acceptance/cases/models/generated_column_test.rb
 - acceptance/cases/models/insert_all_test.rb
-- acceptance/cases/models/interleave_test.rb
 - acceptance/cases/models/logging_test.rb
 - acceptance/cases/models/mutation_test.rb
 - acceptance/cases/models/query_test.rb
 - acceptance/cases/sessions/session_not_found_test.rb
 - acceptance/cases/tasks/database_tasks_test.rb
-- acceptance/cases/transactions/optimistic_locking_test.rb
 - acceptance/cases/transactions/read_only_transactions_test.rb
 - acceptance/cases/transactions/read_write_transactions_test.rb
 - acceptance/cases/type/all_types_test.rb
@@ -317,7 +330,6 @@ files:
 - acceptance/cases/type/time_test.rb
 - acceptance/models/account.rb
 - acceptance/models/address.rb
-- acceptance/models/album.rb
 - acceptance/models/all_types.rb
 - acceptance/models/author.rb
 - acceptance/models/binary_project.rb
@@ -334,7 +346,6 @@ files:
 - acceptance/models/singer.rb
 - acceptance/models/string_io.rb
 - acceptance/models/table_with_sequence.rb
-- acceptance/models/track.rb
 - acceptance/models/transaction.rb
 - acceptance/models/user.rb
 - acceptance/schema/schema.rb
@@ -435,15 +446,6 @@ files:
 - examples/snippets/hints/db/seeds.rb
 - examples/snippets/hints/models/album.rb
 - examples/snippets/hints/models/singer.rb
-- examples/snippets/interleaved-tables-before-7.1/README.md
-- examples/snippets/interleaved-tables-before-7.1/Rakefile
-- examples/snippets/interleaved-tables-before-7.1/application.rb
-- examples/snippets/interleaved-tables-before-7.1/config/database.yml
-- examples/snippets/interleaved-tables-before-7.1/db/migrate/01_create_tables.rb
-- examples/snippets/interleaved-tables-before-7.1/db/seeds.rb
-- examples/snippets/interleaved-tables-before-7.1/models/album.rb
-- examples/snippets/interleaved-tables-before-7.1/models/singer.rb
-- examples/snippets/interleaved-tables-before-7.1/models/track.rb
 - examples/snippets/interleaved-tables/README.md
 - examples/snippets/interleaved-tables/Rakefile
 - examples/snippets/interleaved-tables/application.rb
@@ -550,6 +552,14 @@ files:
 - examples/snippets/timestamp-data-type/db/seeds.rb
 - examples/snippets/timestamp-data-type/models/meeting.rb
 - examples/solidus/README.md
+- gemfiles/7.1.gemfile
+- gemfiles/7.1.gemfile.lock
+- gemfiles/7.2.gemfile
+- gemfiles/7.2.gemfile.lock
+- gemfiles/8.0.gemfile
+- gemfiles/8.0.gemfile.lock
+- gemfiles/8.1.gemfile
+- gemfiles/8.1.gemfile.lock
 - lib/active_record/connection_adapters/spanner/column.rb
 - lib/active_record/connection_adapters/spanner/database_statements.rb
 - lib/active_record/connection_adapters/spanner/errors/transaction_mutation_limit_exceeded_error.rb