activerecord-spanner-adapter 1.2.1 → 1.3.1

data/lib/activerecord_spanner_adapter/base.rb

@@ -141,29 +141,41 @@ module ActiveRecord
     def self._set_composite_primary_key_values primary_key, values
       primary_key_value = []
       primary_key.each do |col|
-        value = values[col]
-
-        if !value && prefetch_primary_key?
-          value =
-            if ActiveRecord::VERSION::MAJOR >= 7
-              ActiveModel::Attribute.from_database col, next_sequence_value, ActiveModel::Type::BigInteger.new
-            else
-              next_sequence_value
-            end
-          values[col] = value
-        end
-        if value.is_a? ActiveModel::Attribute
-          value = value.value
-        end
-        primary_key_value.append value
+        primary_key_value.append _set_composite_primary_key_value col, values
       end
       primary_key_value
     end
 
+    def self._set_composite_primary_key_value primary_key, values
+      value = values[primary_key]
+
+      if value.is_a? ActiveModel::Attribute
+        value = value.value
+      end
+
+      return value unless prefetch_primary_key?
+
+      if value.nil?
+        value = next_sequence_value
+      end
+
+      values[primary_key] =
+        if ActiveRecord::VERSION::MAJOR >= 7
+          ActiveModel::Attribute.from_database primary_key, value,
+                                               ActiveModel::Type::BigInteger.new
+        else
+          value
+        end
+
+      value
+    end
+
     def self._set_single_primary_key_value primary_key, values
       primary_key_value = values[primary_key] || values[primary_key.to_sym]
 
-      if !primary_key_value && prefetch_primary_key?
+      return primary_key_value unless prefetch_primary_key?
+
+      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,
@@ -172,6 +184,7 @@ module ActiveRecord
           values[primary_key] = primary_key_value
         end
       end
+
       primary_key_value
     end
 
@@ -229,9 +242,10 @@ module ActiveRecord
       serialized_values = []
       columns = []
       values.each_pair do |k, v|
-        v = unwrap_attribute v
-        type = metadata.type k
-        serialized_values << (type.method(:serialize).arity < 0 ? type.serialize(v, :mutation) : type.serialize(v))
+        serialized_values << ActiveRecord::Type::Spanner::SpannerActiveRecordConverter
+                             .serialize_with_transaction_isolation_level(metadata.type(k),
+                                                                         unwrap_attribute(v),
+                                                                         :mutation)
         columns << metadata.arel_table[k].name
       end
       [columns, Google::Protobuf::Value.new(list_value:
@@ -280,10 +294,10 @@ module ActiveRecord
       all_columns = []
       all_values.each do |h|
         h.each_pair do |k, v|
-          type = metadata.type k
-          v = self.class.unwrap_attribute v
-          has_serialize_options = type.method(:serialize).arity < 0
-          all_serialized_values << (has_serialize_options ? type.serialize(v, :mutation) : type.serialize(v))
+          all_serialized_values << ActiveRecord::Type::Spanner::SpannerActiveRecordConverter
+                                   .serialize_with_transaction_isolation_level(metadata.type(k),
+                                                                               self.class.unwrap_attribute(v),
+                                                                               :mutation)
           all_columns << metadata.arel_table[k].name
         end
       end
@@ -328,10 +342,10 @@ module ActiveRecord
     def serialize_keys metadata, keys
       serialized_values = []
       keys.each do |key|
-        type = metadata.type key
-        has_serialize_options = type.method(:serialize).arity < 0
-        serialized_values << type.serialize(attribute_in_database(key), :mutation) if has_serialize_options
-        serialized_values << type.serialize(attribute_in_database(key)) unless has_serialize_options
+        serialized_values << ActiveRecord::Type::Spanner::SpannerActiveRecordConverter
+                             .serialize_with_transaction_isolation_level(metadata.type(key),
+                                                                         attribute_in_database(key),
+                                                                         :mutation)
       end
       serialized_values
     end

data/lib/activerecord_spanner_adapter/connection.rb

@@ -36,6 +36,13 @@ module ActiveRecordSpannerAdapter
       end
     end
 
+    # Clears the cached information about the underlying information schemas.
+    # Call this method if you drop and recreate a database with the same name
+    # to prevent the cached information to be used for the new database.
+    def self.reset_information_schemas!
+      @information_schemas = {}
+    end
+
     def self.information_schema config
       @information_schemas ||= {}
       @information_schemas[database_path(config)] ||= \
@@ -89,9 +96,7 @@ module ActiveRecordSpannerAdapter
       @database ||= begin
         database = spanner.database instance_id, database_id
         unless database
-          raise ActiveRecord::NoDatabaseError(
-            "#{spanner.project}/#{instance_id}/#{database_id}"
-          )
+          raise ActiveRecord::NoDatabaseError, "#{spanner.project}/#{instance_id}/#{database_id}"
         end
         database
       end

data/lib/activerecord_spanner_adapter/information_schema.rb

@@ -62,27 +62,34 @@ module ActiveRecordSpannerAdapter
     end
 
     def table_columns table_name, column_name: nil
-      sql = +"SELECT COLUMN_NAME, SPANNER_TYPE, IS_NULLABLE,"
+      sql = +"SELECT COLUMN_NAME, SPANNER_TYPE, IS_NULLABLE, GENERATION_EXPRESSION,"
       sql << " CAST(COLUMN_DEFAULT AS STRING) AS COLUMN_DEFAULT, ORDINAL_POSITION"
       sql << " FROM INFORMATION_SCHEMA.COLUMNS"
       sql << " WHERE TABLE_NAME=%<table_name>s"
       sql << " AND COLUMN_NAME=%<column_name>s" if column_name
       sql << " ORDER BY ORDINAL_POSITION ASC"
 
+      column_options = column_options table_name, column_name
       execute_query(
         sql,
         table_name: table_name,
         column_name: column_name
       ).map do |row|
         type, limit = parse_type_and_limit row["SPANNER_TYPE"]
+        column_name = row["COLUMN_NAME"]
+        options = column_options[column_name]
+
         Table::Column.new \
           table_name,
-          row["COLUMN_NAME"],
+          column_name,
           type,
           limit: limit,
+          allow_commit_timestamp: options["allow_commit_timestamp"],
           ordinal_position: row["ORDINAL_POSITION"],
           nullable: row["IS_NULLABLE"] == "YES",
-          default: row["COLUMN_DEFAULT"]
+          default: row["COLUMN_DEFAULT"],
+          default_function: row["GENERATION_EXPRESSION"],
+          generated: row["GENERATION_EXPRESSION"].present?
       end
     end
 
@@ -240,6 +247,27 @@ module ActiveRecordSpannerAdapter
       end
     end
 
+    def check_constraints table_name
+      sql = <<~SQL.squish
+        SELECT tc.TABLE_NAME,
+               tc.CONSTRAINT_NAME,
+               cc.CHECK_CLAUSE
+        FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc
+        INNER JOIN INFORMATION_SCHEMA.CHECK_CONSTRAINTS cc ON tc.CONSTRAINT_NAME = cc.CONSTRAINT_NAME
+        WHERE tc.TABLE_NAME = %<table_name>s
+          AND tc.CONSTRAINT_TYPE = 'CHECK'
+          AND NOT (tc.CONSTRAINT_NAME LIKE 'CK_IS_NOT_NULL_%%' AND cc.CHECK_CLAUSE LIKE '%%IS NOT NULL')
+      SQL
+
+      rows = execute_query sql, table_name: table_name
+
+      rows.map do |row|
+        ActiveRecord::ConnectionAdapters::CheckConstraintDefinition.new(
+          table_name, row["CHECK_CLAUSE"], name: row["CONSTRAINT_NAME"]
+        )
+      end
+    end
+
     def parse_type_and_limit value
       matched = /^([A-Z]*)\((.*)\)/.match value
       return [value] unless matched
@@ -252,6 +280,27 @@ module ActiveRecordSpannerAdapter
 
     private
 
+    def column_options table_name, column_name
+      sql = +"SELECT COLUMN_NAME, OPTION_NAME, OPTION_TYPE, OPTION_VALUE"
+      sql << " FROM INFORMATION_SCHEMA.COLUMN_OPTIONS"
+      sql << " WHERE TABLE_NAME=%<table_name>s"
+      sql << " AND COLUMN_NAME=%<column_name>s" if column_name
+
+      column_options = Hash.new { |h, k| h[k] = {} }
+      execute_query(
+        sql,
+        table_name: table_name,
+        column_name: column_name
+      ).each_with_object(column_options) do |row, options|
+        next unless row["OPTION_TYPE"] == "BOOL"
+
+        col = row["COLUMN_NAME"]
+        opt = row["OPTION_NAME"]
+        value = row["OPTION_VALUE"] == "TRUE"
+        options[col][opt] = value
+      end
+    end
+
     def execute_query sql, params = {}
       params = params.transform_values { |v| quote v }
       sql = format sql, params

data/lib/activerecord_spanner_adapter/table/column.rb

@@ -8,7 +8,8 @@ module ActiveRecordSpannerAdapter
   class Table
     class Column
       attr_accessor :table_name, :name, :type, :limit, :ordinal_position,
-                    :allow_commit_timestamp, :default, :primary_key
+                    :allow_commit_timestamp, :default, :default_function, :generated,
+                    :primary_key
       attr_writer :nullable
 
       def initialize \
@@ -19,7 +20,9 @@ module ActiveRecordSpannerAdapter
           ordinal_position: nil,
           nullable: true,
           allow_commit_timestamp: nil,
-          default: nil
+          default: nil,
+          default_function: nil,
+          generated: nil
         @table_name = table_name.to_s
         @name = name.to_s
         @type = type
@@ -28,6 +31,8 @@ module ActiveRecordSpannerAdapter
         @ordinal_position = ordinal_position
         @allow_commit_timestamp = allow_commit_timestamp
         @default = default
+        @default_function = default_function
+        @generated = generated == true
         @primary_key = false
       end
 

data/lib/activerecord_spanner_adapter/version.rb

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

data/lib/arel/visitors/spanner.rb

@@ -30,10 +30,16 @@ module Arel # :nodoc: all
         collector.hints = {}
         collector.table_hints = {}
         collector.join_hints = {}
+
         sql, binds = accept(node, collector).value
         sql = collector.hints[:statement_hint].value + sql if collector.hints[:statement_hint]
-        binds << collector.hints[:staleness] if collector.hints[:staleness]
-        [sql, binds]
+
+        if binds
+          binds << collector.hints[:staleness] if collector.hints[:staleness]
+          [sql, binds]
+        else
+          sql
+        end
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner
@@ -268,12 +268,16 @@ files:
 - acceptance/cases/migration/references_index_test.rb
 - acceptance/cases/migration/references_statements_test.rb
 - acceptance/cases/migration/rename_column_test.rb
+- acceptance/cases/migration/schema_dumper_test.rb
 - acceptance/cases/models/calculation_query_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
@@ -292,6 +296,7 @@ files:
 - acceptance/models/account.rb
 - acceptance/models/address.rb
 - acceptance/models/album.rb
+- acceptance/models/album_partial_disabled.rb
 - acceptance/models/all_types.rb
 - acceptance/models/author.rb
 - acceptance/models/club.rb
@@ -479,6 +484,7 @@ files:
 - examples/snippets/timestamp-data-type/db/seeds.rb
 - examples/snippets/timestamp-data-type/models/meeting.rb
 - examples/solidus/README.md
+- lib/active_record/connection_adapters/spanner/column.rb
 - lib/active_record/connection_adapters/spanner/database_statements.rb
 - lib/active_record/connection_adapters/spanner/quoting.rb
 - lib/active_record/connection_adapters/spanner/schema_cache.rb