activerecord-cockroachdb-adapter 7.1.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c3f85e82470685a2ece6851d557bcaf03f5a77ce309d76062c3960ca17d1606
-  data.tar.gz: b6ab7bfb9d29feebf217b70b11ccf2f73e6fb0853138cc27f4556f07b6c36dac
+  metadata.gz: 672289521537934d4b9ed2d707c3faf55b4761c8d2b4e9e12cd8622166963ae7
+  data.tar.gz: 345a84d7c5bca0d574aa65eb0fb0e30986a23fcc2830f422e5b1d80ffa971076
 SHA512:
-  metadata.gz: 96fbb4c5a42c1ab3f2fe590f3c74012b883c818608c5b9d0525f30739f1d4d8733c95cfffd31a8a05350d6210d995f84d915727a494264d1cb1c217d10d200b1
-  data.tar.gz: 12ae86ab8f26eb074eabb60cd3f831eed44729d98f70bdc88d1c0d9c3d5cff5680ae7cf0a9643756395e6cfc1257cb7fc62ee5abab4c37c6f0fe45817fc619a0
+  metadata.gz: 4ce6d2119bfc27192630c32ec488b3e7f533cc64963fc04035609122e5bdbc33e75b83766ca68e3eb73e2592b2fe0a1bae53a74389527762f790b16bda687da9
+  data.tar.gz: 42e10ab1106e4ffc4df89bbbf98f8ddbd05b6bccf97b062a9445ebf874a8bfef9e628dce8b39c3287424a7094f70790457293a2766a849bd39ac0e20c7a684fe

data/.github/workflows/ci.yml

@@ -37,15 +37,17 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        crdb: [v23.1.11]
+        # https://www.cockroachlabs.com/docs/releases/release-support-policy
+        crdb: [v22.2, v23.1, v23.2]
         ruby: [head]
     name: Test (crdb=${{ matrix.crdb }} ruby=${{ matrix.ruby }})
     steps:
       - name: Set Up Actions
         uses: actions/checkout@v4
       - name: Install GEOS
-        run: sudo apt-get install libgeos-dev
+        run: sudo apt-get install -yqq libgeos-dev
       - name: Set Up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -54,16 +56,28 @@ jobs:
       - name: Install and Start Cockroachdb
         run: |
           # Download CockroachDB
-          wget -qO- https://binaries.cockroachdb.com/cockroach-${{ matrix.crdb }}.linux-amd64.tgz | tar xvz
+          readonly full_version=$(ruby -rnet/http -ruri -ryaml -e '
+            link = "https://raw.githubusercontent.com/cockroachdb/docs/main/src/current/_data/releases.yml"
+            puts YAML.safe_load(Net::HTTP.get(URI(link))).reverse.find {
+              _1["major_version"] == "${{ matrix.crdb }}" &&
+                _1["release_type"] == "Production" &&
+                !_1["cloud_only"] &&
+                !_1["withdrawn"] &&
+                !_1["release_name"].include?("-") # Pre-release
+            }["release_name"]
+          ')
 
-          export PATH=./cockroach-${{ matrix.crdb }}.linux-amd64/:$PATH
+          echo "Downloading $full_version..."
+          wget -qO- "https://binaries.cockroachdb.com/cockroach-$full_version.linux-amd64.tgz" | tar xvz
+
+          export PATH=./cockroach-$full_version.linux-amd64/:$PATH
           readonly urlfile=cockroach-url
 
           # Start a CockroachDB server and wait for it to become ready.
           rm -f "$urlfile"
           rm -rf cockroach-data
           # Start CockroachDB.
-          cockroach start-single-node --max-sql-memory=25% --cache=25% --insecure --host=localhost --spatial-libs=./cockroach-${{ matrix.crdb }}.linux-amd64/lib --listening-url-file="$urlfile" >/dev/null 2>&1 &
+          cockroach start-single-node --max-sql-memory=25% --cache=25% --insecure --host=localhost --spatial-libs=./cockroach-$full_version.linux-amd64/lib --listening-url-file="$urlfile" >/dev/null 2>&1 &
           # Ensure CockroachDB is stopped on script exit.
           # Wait until CockroachDB has started.
           for i in {0..3}; do
@@ -72,27 +86,6 @@ jobs:
             echo "server not yet available; sleeping for $backoff seconds"
             sleep $backoff
           done
-          cockroach sql --insecure -e "
-            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 jobs.retention_time = '180s';
-            SET CLUSTER SETTING sql.defaults.experimental_alter_column_type.enabled = 'true';
-
-            ALTER RANGE default CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;
-            ALTER TABLE system.public.jobs CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;
-            ALTER RANGE meta CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;
-            ALTER RANGE system CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;
-            ALTER RANGE liveness CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;
-
-            SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
-            SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = 'true';
-            SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
-            SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
-            SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
-
-            SET CLUSTER SETTING sql.defaults.experimental_temporary_tables.enabled = 'true';
-          "
+          cat ${{ github.workspace }}/setup.sql | cockroach sql --insecure
       - name: Test
         run: bundle exec rake test TESTOPTS='--profile=3'

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.3

data/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ## Ongoing
 
-- Add support for [AOST](cockroachlabs.com/docs/stable/as-of-system-time) queries ([#284](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/284))
-- Dump schema name in foreign keys ([#289](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/289))
+## 7.1.1 - 2024-05-01
+
+- Enable precision support ([#318](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/318))
+- Support arbitrary max identifier length ([#317](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/317)).
+- Fix `#schema_names` not to return `crdb_internal` ([#316](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/316))
 
 ## 7.1.0 - 2024-01-30
 
 - Add support for Rails 7.1 ([#300](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/300)).
+- Add support for [AOST](cockroachlabs.com/docs/stable/as-of-system-time) queries ([#284](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/284))
+- Dump schema name in foreign keys ([#289](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/289))
 
 ## 7.0.3 - 2023-08-23
 

data/Gemfile

@@ -55,6 +55,10 @@ group :development, :test do
   gem "debug"
   gem "minitest-excludes", "~> 2.0.1"
   gem "minitest-github_action_reporter", github: "BuonOmo/minitest-github_action_reporter", require: "minitest/github_action_reporter_plugin"
+  gem "ostruct", "~> 0.6"
+
+  # Gems used for tests meta-programming.
+  gem "parser"
 
   # Gems used by the ActiveRecord test suite
   gem "bcrypt", "~> 3.1.18"

data/bin/console

@@ -12,7 +12,7 @@ require "active_record"
 #       structure_load(Post.connection_db_config, "awesome-file.sql")
 require "active_record/connection_adapters/cockroachdb/database_tasks"
 
-schema_kind = ENV.fetch("SCHEMA_KIND", "default")
+schema_kind = ENV.fetch("SCHEMA_KIND", ENV.fetch("SCHEMA", "default"))
 
 system("cockroach sql --insecure --host=localhost:26257 --execute='drop database if exists ar_crdb_console'",
   exception: true)

data/bin/start-cockroachdb

@@ -9,7 +9,7 @@ pid_file="$root_dir/tmp/cockroach.pid"
 log_file="$root_dir/tmp/cockroachdb.log"
 
 mkdir -p "$root_dir/tmp"
-[[ -f "$pid_file" ]] && kill -9 $(cat "$pid_file")
+[[ -f "$pid_file" ]] && kill -9 $(cat "$pid_file") || true
 rm -f "$pid_file"
 
 if ! (( ${+commands[cockroach]} )); then
@@ -18,7 +18,9 @@ See https://www.cockroachlabs.com/docs/stable/install-cockroachdb.html'
 fi
 
 cockroach start-single-node \
-	--insecure --store=type=mem,size=0.25 --advertise-addr=localhost --pid-file "$pid_file" \
+	--insecure --store=type=mem,size=0.25 --advertise-addr=localhost \
+	--spatial-libs="$(geos-config --includes)" \
+	--pid-file "$pid_file" \
 	&> "$log_file" &
 
 until [[ -f "$pid_file" ]]; do
@@ -26,23 +28,6 @@ until [[ -f "$pid_file" ]]; do
 done
 
 
-cat <<-SQL | cockroach sql --insecure --host=localhost:26257 > /dev/null
--- https://www.cockroachlabs.com/docs/stable/local-testing.html
-SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = true;
-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.defaults.experimental_alter_column_type.enabled = 'true';
-SET CLUSTER SETTING sql.defaults.experimental_temporary_tables.enabled = 'true';
-SQL
+cat "$root_dir/setup.sql" | cockroach sql --insecure --host=localhost:26257 > /dev/null
 
 echo "CockroachDB started. PID: $(cat "$pid_file"). log: $log_file"

data/lib/active_record/connection_adapters/cockroachdb/database_tasks.rb

@@ -26,6 +26,7 @@ module ActiveRecord
             old_search_path = conn.schema_search_path
             conn.schema_search_path = search_path
             File.open(filename, "w") do |file|
+              # NOTE: There is no issue with the crdb_internal schema, it is ignored by SHOW CREATE.
               %w(SCHEMAS TYPES).each do |object_kind|
                 ActiveRecord::Base.connection.execute("SHOW CREATE ALL #{object_kind}").each_row { file.puts _1 }
               end
@@ -44,7 +45,7 @@ module ActiveRecord
 
                 file.puts sql
               end
-              file.puts "SET seach_path TO #{conn.schema_search_path};\n\n"
+              file.puts "SET search_path TO #{conn.schema_search_path};\n\n"
             end
           ensure
             conn.schema_search_path = old_search_path

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

@@ -4,6 +4,13 @@ module ActiveRecord
       module SchemaStatements
         include ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements
 
+        # OVERRIDE: We do not want to see the crdb_internal schema in the names.
+        #
+        # Returns an array of schema names.
+        def schema_names
+          super - ["crdb_internal"]
+        end
+
         def add_index(table_name, column_name, **options)
           super
         rescue ActiveRecord::StatementInvalid => error
@@ -40,7 +47,7 @@ module ActiveRecord
         # so we append it manually.
         def foreign_keys(table_name)
           scope = quoted_scope(table_name)
-          fk_info = exec_query(<<~SQL, "SCHEMA")
+          fk_info = internal_exec_query(<<~SQL, "SCHEMA")
             SELECT CASE
               WHEN n2.nspname = current_schema()
               THEN ''

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rgeo/active_record"
 
 require_relative "../../arel/nodes/join_source_ext"
@@ -16,7 +18,6 @@ require "active_record/connection_adapters/cockroachdb/type"
 require "active_record/connection_adapters/cockroachdb/column"
 require "active_record/connection_adapters/cockroachdb/spatial_column_info"
 require "active_record/connection_adapters/cockroachdb/setup"
-require "active_record/connection_adapters/cockroachdb/oid/type_map_initializer"
 require "active_record/connection_adapters/cockroachdb/oid/spatial"
 require "active_record/connection_adapters/cockroachdb/oid/interval"
 require "active_record/connection_adapters/cockroachdb/oid/date_time"
@@ -31,35 +32,15 @@ require_relative "../relation/query_methods_ext"
 ActiveRecord::ConnectionAdapters::CockroachDB.initial_setup
 
 module ActiveRecord
+  # TODO: once in rails 7.2, remove this and replace with a `#register` call.
+  # See: https://github.com/rails/rails/commit/22a26d7f74ea8f0d5f7c4169531ae38441cfd5e5#diff-2468c670eb10c24bd2823e42708489a336d6f21c6efc7e3c4a574166fa77bb22
   module ConnectionHandling
+    def cockroachdb_adapter_class
+      ConnectionAdapters::CockroachDBAdapter
+    end
+
     def cockroachdb_connection(config)
-      # This is copied from the PostgreSQL adapter.
-      conn_params = config.symbolize_keys.compact
-
-      # Map ActiveRecords param names to PGs.
-      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
-      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
-
-      # Forward only valid config params to PG::Connection.connect.
-      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
-      conn_params.slice!(*valid_conn_param_keys)
-
-      ConnectionAdapters::CockroachDBAdapter.new(
-        ConnectionAdapters::CockroachDBAdapter.new_client(conn_params),
-        logger,
-        conn_params,
-        config
-      )
-    # This rescue flow appears in new_client, but it is needed here as well
-    # since Cockroach will sometimes not raise until a query is made.
-    rescue ActiveRecord::StatementInvalid => error
-      no_db_err_check1 = conn_params && conn_params[:dbname] && error.cause.message.include?(conn_params[:dbname])
-      no_db_err_check2 = conn_params && conn_params[:dbname] && error.cause.message.include?("pg_type")
-      if no_db_err_check1 || no_db_err_check2
-        raise ActiveRecord::NoDatabaseError
-      else
-        raise ActiveRecord::ConnectionNotEstablished, error.message
-      end
+      cockroachdb_adapter_class.new(config)
     end
   end
 end
@@ -101,7 +82,7 @@ module ActiveRecord
     ConnectionPool.prepend(CockroachDBConnectionPool)
 
     class CockroachDBAdapter < PostgreSQLAdapter
-      ADAPTER_NAME = "CockroachDB".freeze
+      ADAPTER_NAME = "CockroachDB"
       DEFAULT_PRIMARY_KEY = "rowid"
 
       SPATIAL_COLUMN_OPTIONS =
@@ -155,18 +136,21 @@ module ActiveRecord
         @max_transaction_retries ||= @config.fetch(:max_transaction_retries, 3)
       end
 
-      # CockroachDB 20.1 can run queries that work against PostgreSQL 10+.
-      def postgresql_version
-        100000
+      def get_database_version
+        major, minor, patch = query_value("SHOW crdb_version").match(/v(\d+).(\d+).(\d+)/)[1..].map(&:to_i)
+        major * 100 * 100 + minor * 100 + patch
       end
+      undef :postgresql_version
+      alias :cockroachdb_version :database_version
 
-      def supports_bulk_alter?
-        true
+      def supports_datetime_with_precision?
+        # https://github.com/cockroachdb/cockroach/pull/111400
+        database_version >= 23_01_13
       end
 
-      def supports_json?
-        # FIXME(joey): Add a version check.
-        true
+      def supports_nulls_not_distinct?
+        # https://github.com/cockroachdb/cockroach/issues/115836
+        false
       end
 
       def supports_ddl_transactions?
@@ -181,10 +165,6 @@ module ActiveRecord
         false
       end
 
-      def supports_partial_index?
-        true
-      end
-
       def supports_index_include?
         false
       end
@@ -200,14 +180,6 @@ module ActiveRecord
         false
       end
 
-      def supports_datetime_with_precision?
-        false
-      end
-
-      def supports_comments?
-        true
-      end
-
       def supports_comments_in_create?
         false
       end
@@ -232,21 +204,6 @@ module ActiveRecord
         false
       end
 
-      # This is hardcoded to 63 (as previously was in ActiveRecord 5.0) to aid in
-      # migration from PostgreSQL to CockroachDB. In practice, this limitation
-      # is arbitrary since CockroachDB supports index name lengths and table alias
-      # lengths far greater than this value. For the time being though, we match
-      # the original behavior for PostgreSQL to simplify migrations.
-      #
-      # Note that in the migration to ActiveRecord 5.1, this was changed in
-      # PostgreSQLAdapter to use `SHOW max_identifier_length` (which does not
-      # exist in CockroachDB). Therefore, we have to redefine this here.
-      def max_identifier_length
-        63
-      end
-      alias index_name_length max_identifier_length
-      alias table_alias_length max_identifier_length
-
       # NOTE: This commented bit of code allows to have access to crdb version,
       # which can be useful for feature detection. However, we currently don't
       # need, hence we avoid the extra queries.
@@ -278,6 +235,21 @@ module ActiveRecord
         false
       end
 
+      def initialize(...)
+        super
+
+      # This rescue flow appears in new_client, but it is needed here as well
+      # since Cockroach will sometimes not raise until a query is made.
+      rescue ActiveRecord::StatementInvalid => error
+        no_db_err_check1 = @connection_parameters && @connection_parameters[:dbname] && error.cause.message.include?(@connection_parameters[:dbname])
+        no_db_err_check2 = @connection_parameters && @connection_parameters[:dbname] && error.cause.message.include?("pg_type")
+        if no_db_err_check1 || no_db_err_check2
+          raise ActiveRecord::NoDatabaseError
+        else
+          raise ActiveRecord::ConnectionNotEstablished, error.message
+        end
+      end
+
       # override
       # The PostgreSQLAdapter uses syntax for an anonymous function
       # (DO $$) that CockroachDB does not support.
@@ -351,7 +323,6 @@ module ActiveRecord
         def extract_value_from_default(default)
           super ||
             extract_escaped_string_from_default(default) ||
-            extract_time_from_default(default) ||
             extract_empty_array_from_default(default) ||
             extract_decimal_from_default(default)
         end
@@ -369,32 +340,6 @@ module ActiveRecord
           "\"#{$1}\"".undump.gsub("\\'".freeze, "'".freeze)
         end
 
-        # This method exists to extract the correct time and date defaults for a
-        # couple of reasons.
-        # 1) There's a bug in CockroachDB where the date type is missing from
-        # the column info query.
-        # https://github.com/cockroachdb/cockroach/issues/47285
-        # 2) PostgreSQL's timestamp without time zone type maps to CockroachDB's
-        # TIMESTAMP type. TIMESTAMP includes a UTC time zone while timestamp
-        # without time zone doesn't.
-        # https://www.cockroachlabs.com/docs/v19.2/timestamp.html#variants
-        def extract_time_from_default(default)
-          return unless default =~ /\A'(.*)'\z/
-
-          # If default has a UTC time zone, we'll drop the time zone information
-          # so it acts like PostgreSQL's timestamp without time zone. Then, try
-          # to parse the resulting string to verify if it's a time.
-          time = if default =~ /\A'(.*)(\+00:00)'\z/
-            $1
-          else
-            default
-          end
-
-          Time.parse(time).to_s
-        rescue
-          nil
-        end
-
         # CockroachDB stores default values for arrays in the `ARRAY[...]` format.
         # In general, it is hard to parse that, but it is easy to handle the common
         # case of an empty array.

data/lib/active_record/relation/query_methods_ext.rb

@@ -76,10 +76,9 @@ module ActiveRecord
         self
       end
 
-      # TODO: reset or no reset?
-
       def show_create
-        connection.execute("show create table #{connection.quote_table_name self.table_name}").first["create_statement"]
+        quoted_table = connection.quote_table_name self.table_name
+        connection.select_one("show create table #{quoted_table}")["create_statement"]
       end
 
       private

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  COCKROACH_DB_ADAPTER_VERSION = "7.1.0"
+  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.1.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,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
@@ -123,6 +122,7 @@ files:
 - 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
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: CockroachDB adapter for ActiveRecord.

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