activerecord-cockroachdb-adapter 7.0.3 → 7.1.1

data/lib/active_record/relation/query_methods_ext.rb

@@ -3,6 +3,23 @@
 module ActiveRecord
   class Relation
     module QueryMethodsExt
+      def aost!(time) # :nodoc:
+        unless time.nil? || time.is_a?(Time)
+          raise ArgumentError, "Unsupported argument type: #{time} (#{time.class})"
+        end
+
+        @aost = time
+        self
+      end
+
+      # Set system time for the current query. Using
+      # `.aost(nil)` resets.
+      #
+      # See cockroachlabs.com/docs/stable/as-of-system-time
+      def aost(time)
+        spawn.aost!(time)
+      end
+
       def from!(...) # :nodoc:
         @force_index = nil
         @index_hint = nil
@@ -59,8 +76,19 @@ module ActiveRecord
         self
       end
 
+      def show_create
+        quoted_table = connection.quote_table_name self.table_name
+        connection.select_one("show create table #{quoted_table}")["create_statement"]
+      end
+
       private
 
+      def build_arel(...)
+        arel = super
+        arel.aost(@aost) if @aost.present?
+        arel
+      end
+
       def from_clause_is_a_table_name?
         # if empty, we are just dealing with the current table.
         return true if from_clause.empty?
@@ -94,5 +122,5 @@ module ActiveRecord
   # as ancestor. That is how active_record is doing is as well.
   #
   # @see https://github.com/rails/rails/blob/914130a9f/activerecord/lib/active_record/querying.rb#L23
-  Querying.delegate(:force_index, :index_hint, to: :all)
+  Querying.delegate(:force_index, :index_hint, :aost, :show_create, to: :all)
 end

data/lib/arel/nodes/join_source_ext.rb

@@ -0,0 +1,28 @@
+module Arel
+  module Nodes
+    module JoinSourceExt
+      def initialize(...)
+        super
+        @aost = nil
+      end
+
+      def hash
+        [*super, aost].hash
+      end
+
+      def eql?(other)
+        super && aost == other.aost
+      end
+      alias_method :==, :eql?
+    end
+    JoinSource.attr_accessor :aost
+    JoinSource.prepend JoinSourceExt
+  end
+  module SelectManagerExt
+    def aost(time)
+      @ctx.source.aost = time
+      nil
+    end
+  end
+  SelectManager.prepend SelectManagerExt
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  COCKROACH_DB_ADAPTER_VERSION = "7.0.3"
+  COCKROACH_DB_ADAPTER_VERSION = "7.1.1"
 end

data/setup.sql

@@ -0,0 +1,18 @@
+-- https://www.cockroachlabs.com/docs/stable/local-testing.html
+SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
+SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
+SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
+SET CLUSTER SETTING jobs.retention_time = '15s';
+SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
+SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
+ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 600;
+ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 600;
+
+CREATE DATABASE activerecord_unittest;
+CREATE DATABASE activerecord_unittest2;
+
+SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
+SET CLUSTER SETTING sql.stats.histogram_collection.enabled = false;
+
+SET CLUSTER SETTING sql.defaults.experimental_alter_column_type.enabled = 'true';
+SET CLUSTER SETTING sql.defaults.experimental_temporary_tables.enabled = 'true';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.1.1
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.3
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".github/workflows/ci.yml"
 - ".github/workflows/docker.yml"
 - ".gitignore"
@@ -87,6 +88,8 @@ files:
 - Rakefile
 - activerecord-cockroachdb-adapter.gemspec
 - bin/console
+- bin/console_schemas/default.rb
+- bin/console_schemas/schemas.rb
 - bin/setup
 - bin/start-cockroachdb
 - build/Dockerfile
@@ -103,7 +106,6 @@ files:
 - lib/active_record/connection_adapters/cockroachdb/oid/date_time.rb
 - lib/active_record/connection_adapters/cockroachdb/oid/interval.rb
 - lib/active_record/connection_adapters/cockroachdb/oid/spatial.rb
-- lib/active_record/connection_adapters/cockroachdb/oid/type_map_initializer.rb
 - lib/active_record/connection_adapters/cockroachdb/quoting.rb
 - lib/active_record/connection_adapters/cockroachdb/referential_integrity.rb
 - lib/active_record/connection_adapters/cockroachdb/schema_creation.rb
@@ -118,7 +120,9 @@ files:
 - lib/active_record/migration/cockroachdb/compatibility.rb
 - lib/active_record/relation/query_methods_ext.rb
 - lib/activerecord-cockroachdb-adapter.rb
+- lib/arel/nodes/join_source_ext.rb
 - lib/version.rb
+- setup.sql
 homepage: https://github.com/cockroachdb/activerecord-cockroachdb-adapter
 licenses:
 - Apache-2.0

data/lib/active_record/connection_adapters/cockroachdb/oid/type_map_initializer.rb

@@ -1,26 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module CockroachDB
-      module OID
-        module TypeMapInitializer
-          # override
-          # Replaces the query with a faster version that doesn't rely on the
-          # use of 'array_in(cstring,oid,integer)'::regprocedure.
-          def query_conditions_for_initial_load
-            known_type_names = @store.keys.map { |n| "'#{n}'" }
-            known_type_types = %w('r' 'e' 'd')
-            <<~SQL % [known_type_names.join(", "), known_type_types.join(", ")]
-              WHERE
-                t.typname IN (%s)
-                OR t.typtype IN (%s)
-                OR (t.typarray = 0 AND t.typcategory='A')
-                OR t.typelem != 0
-            SQL
-          end
-        end
-
-        PostgreSQL::OID::TypeMapInitializer.prepend(TypeMapInitializer)
-      end
-    end
-  end
-end