activerecord-cockroachdb-adapter 7.1.0 → 7.2.0

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

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB

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

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # The PostgresSQL Adapter's ReferentialIntegrity module can disable and
 # re-enable foreign key constraints by disabling all table triggers. Since
 # triggers are not available in CockroachDB, we have to remove foreign keys and

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

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB
@@ -15,4 +29,3 @@ module ActiveRecord
     end
   end
 end
-

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

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB
@@ -16,4 +30,3 @@ module ActiveRecord
     end
   end
 end
-

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

@@ -1,9 +1,32 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB
       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
@@ -32,6 +55,84 @@ module ActiveRecord
           end
         end
 
+        # OVERRIDE: CockroachDB does not support deferrable constraints.
+        #   See: https://go.crdb.dev/issue-v/31632/v23.1
+        def foreign_key_options(from_table, to_table, options)
+          options = super
+          options.delete(:deferrable) unless supports_deferrable_constraints?
+          options
+        end
+
+        # OVERRIDE: Added `unique_rowid` to the last line of the second query.
+        #   This is a CockroachDB-specific function used for primary keys.
+        #   Also make sure we don't consider `NOT VISIBLE` columns.
+        #
+        # Returns a table's primary key and belonging sequence.
+        def pk_and_sequence_for(table) # :nodoc:
+          # First try looking for a sequence with a dependency on the
+          # given table's primary key.
+          result = query(<<~SQL, "SCHEMA")[0]
+            SELECT attr.attname, nsp.nspname, seq.relname
+            FROM pg_class      seq,
+                 pg_attribute  attr,
+                 pg_depend     dep,
+                 pg_constraint cons,
+                 pg_namespace  nsp,
+                 -- TODO: use the pg_catalog.pg_attribute(attishidden) column when
+                 --   it is added instead of joining on crdb_internal.
+                 --   See https://github.com/cockroachdb/cockroach/pull/126397
+                 crdb_internal.table_columns tc
+            WHERE seq.oid           = dep.objid
+              AND seq.relkind       = 'S'
+              AND attr.attrelid     = dep.refobjid
+              AND attr.attnum       = dep.refobjsubid
+              AND attr.attrelid     = cons.conrelid
+              AND attr.attnum       = cons.conkey[1]
+              AND seq.relnamespace  = nsp.oid
+              AND attr.attrelid     = tc.descriptor_id
+              AND attr.attname      = tc.column_name
+              AND tc.hidden         = false
+              AND cons.contype      = 'p'
+              AND dep.classid       = 'pg_class'::regclass
+              AND dep.refobjid      = #{quote(quote_table_name(table))}::regclass
+          SQL
+
+          if result.nil? || result.empty?
+            result = query(<<~SQL, "SCHEMA")[0]
+              SELECT attr.attname, nsp.nspname,
+                CASE
+                  WHEN pg_get_expr(def.adbin, def.adrelid) !~* 'nextval' THEN NULL
+                  WHEN split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2) ~ '.' THEN
+                    substr(split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2),
+                           strpos(split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2), '.')+1)
+                  ELSE split_part(pg_get_expr(def.adbin, def.adrelid), '''', 2)
+                END
+              FROM pg_class       t
+              JOIN pg_attribute   attr ON (t.oid = attrelid)
+              JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
+              JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
+              JOIN pg_namespace   nsp  ON (t.relnamespace = nsp.oid)
+              -- TODO: use the pg_catalog.pg_attribute(attishidden) column when
+              --   it is added instead of joining on crdb_internal.
+              --   See https://github.com/cockroachdb/cockroach/pull/126397
+              JOIN crdb_internal.table_columns tc ON (attr.attrelid = tc.descriptor_id AND attr.attname = tc.column_name)
+              WHERE t.oid = #{quote(quote_table_name(table))}::regclass
+                AND tc.hidden = false
+                AND cons.contype = 'p'
+                AND pg_get_expr(def.adbin, def.adrelid) ~* 'nextval|uuid_generate|gen_random_uuid|unique_rowid'
+            SQL
+          end
+
+          pk = result.shift
+          if result.last
+            [pk, PostgreSQL::Name.new(*result)]
+          else
+            [pk, nil]
+          end
+        rescue
+          nil
+        end
+
         # override
         # Modified version of the postgresql foreign_keys method.
         # Replaces t2.oid::regclass::text with t2.relname since this is
@@ -40,7 +141,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/setup.rb

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord # :nodoc:
   module ConnectionAdapters # :nodoc:
     module CockroachDB  # :nodoc:

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

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB

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

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord # :nodoc:
   module ConnectionAdapters # :nodoc:
     module CockroachDB # :nodoc:

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

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB

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

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   module Type
     module CRDBExt

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require "rgeo/active_record"
 
 require_relative "../../arel/nodes/join_source_ext"
@@ -16,7 +32,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"
@@ -30,40 +45,6 @@ require_relative "../relation/query_methods_ext"
 # Defined in ./setup.rb
 ActiveRecord::ConnectionAdapters::CockroachDB.initial_setup
 
-module ActiveRecord
-  module ConnectionHandling
-    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
-    end
-  end
-end
-
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDBConnectionPool
@@ -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,29 @@ 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
+        with_raw_connection do |conn|
+          conn.async_exec("SHOW crdb_version") do |result|
+            major, minor, patch = result
+              .getvalue(0, 0)
+              .match(/v(\d+).(\d+).(\d+)/)
+              .captures
+              .map(&:to_i)
+            major * 100 * 100 + minor * 100 + patch
+          end
+        end
       end
+      undef :postgresql_version
+      alias :cockroachdb_version :database_version
 
-      def supports_bulk_alter?
+      def supports_datetime_with_precision?
+        # https://github.com/cockroachdb/cockroach/pull/111400
         true
       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?
@@ -178,10 +170,6 @@ module ActiveRecord
       end
 
       def supports_materialized_views?
-        false
-      end
-
-      def supports_partial_index?
         true
       end
 
@@ -200,14 +188,6 @@ module ActiveRecord
         false
       end
 
-      def supports_datetime_with_precision?
-        false
-      end
-
-      def supports_comments?
-        true
-      end
-
       def supports_comments_in_create?
         false
       end
@@ -229,53 +209,47 @@ module ActiveRecord
       end
 
       def supports_deferrable_constraints?
+        # https://go.crdb.dev/issue-v/31632/v23.1
         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
+      def check_version # :nodoc:
+        # https://www.cockroachlabs.com/docs/releases/release-support-policy
+        if database_version < 23_01_12 # < 23.1.12
+          raise "Your version of CockroachDB (#{database_version}) is too old. Active Record supports CockroachDB >= 23.1.12."
+        end
       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.
+      def configure_connection(...)
+        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.
       #
-      #   def initialize(connection, logger, conn_params, config)
-      #     super(connection, logger, conn_params, config)
-
-      #     # crdb_version is the version of the binary running on the node. We
-      #     # really want to use `SHOW CLUSTER SETTING version` to get the cluster
-      #     # version, but that is only available to admins. Instead, we can use
-      #     # crdb_internal.is_at_least_version, but that's only available in 22.1.
-      #     crdb_version_string = query_value("SHOW crdb_version")
-      #     if crdb_version_string.include? "v22.1"
-      #       version_num = query_value(<<~SQL, "VERSION")
-      #         SELECT
-      #           CASE
-      #           WHEN crdb_internal.is_at_least_version('22.2') THEN 2220
-      #           WHEN crdb_internal.is_at_least_version('22.1') THEN 2210
-      #           ELSE 2120
-      #           END;
-      #       SQL
-      #     end
-      #     @crdb_version = version_num.to_i
-      #   end
-
-      def self.database_exists?(config)
-        !!ActiveRecord::Base.cockroachdb_connection(config)
-      rescue ActiveRecord::NoDatabaseError
-        false
+      # See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/337#issuecomment-2328419453
+      #
+      # The error conditions used to differ from the ones in new_client, but
+      # the reasons why are no longer relevant. We keep this in sync with new_client
+      # even though some conditions might never be checked.
+      #
+      # See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/229
+      #
+      # We have to rescue `ActiveRecord::StatementInvalid` instead of `::PG::Error`
+      # here as the error has already been casted (in `#with_raw_connection` as
+      # of Rails 7.2.1).
+      rescue ActiveRecord::StatementInvalid => error
+        conn_params = @connection_parameters
+        if conn_params && conn_params[:dbname] == "postgres"
+          raise ActiveRecord::ConnectionNotEstablished, error.message
+        elsif conn_params && conn_params[:dbname] && error.cause.message.include?(conn_params[:dbname])
+          raise ActiveRecord::NoDatabaseError.db_error(conn_params[:dbname])
+        elsif conn_params && conn_params[:user] && error.cause.message.include?(conn_params[:user])
+          raise ActiveRecord::DatabaseConnectionError.username_error(conn_params[:user])
+        elsif conn_params && conn_params[:host] && error.cause.message.include?(conn_params[:host])
+          raise ActiveRecord::DatabaseConnectionError.hostname_error(conn_params[:host])
+        else
+          raise ActiveRecord::ConnectionNotEstablished, error.message
+        end
       end
 
       # override
@@ -320,7 +294,6 @@ module ActiveRecord
             precision = extract_precision(sql_type)
             scale = extract_scale(sql_type)
 
-
             # The type for the numeric depends on the width of the field,
             # so we'll do something special here.
             #
@@ -351,7 +324,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 +341,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.
@@ -566,7 +512,7 @@ module ActiveRecord
         # so this modified query uses AS OF SYSTEM TIME '-10s' to read historical data.
         def add_pg_decoders
           if @config[:use_follower_reads_for_type_introspection]
-            @default_timezone = nil
+            @mapped_default_timezone = nil
             @timestamp_decoder = nil
 
             coders_by_name = {
@@ -581,6 +527,7 @@ module ActiveRecord
               "timestamp" => PG::TextDecoder::TimestampUtc,
               "timestamptz" => PG::TextDecoder::TimestampWithTimeZone,
             }
+            coders_by_name["date"] = PG::TextDecoder::Date if decode_dates
 
             known_coder_types = coders_by_name.keys.map { |n| quote(n) }
             query = <<~SQL % known_coder_types.join(", ")
@@ -588,7 +535,6 @@ module ActiveRecord
               FROM pg_type as t AS OF SYSTEM TIME '-10s'
               WHERE t.typname IN (%s)
             SQL
-
             coders = execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |result|
               result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
             end

data/lib/active_record/migration/cockroachdb/compatibility.rb

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require "active_record/migration"
 require "active_record/migration/compatibility"
 

data/lib/active_record/relation/query_methods_ext.rb

@@ -1,5 +1,19 @@
 # frozen_string_literal: true
 
+# Copyright 2024 The Cockroach Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 module ActiveRecord
   class Relation
     module QueryMethodsExt
@@ -76,10 +90,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