activerecord-cockroachdb-adapter 7.0.2 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24349ecd71877aabdf47013dd73406e4bb16c0495fee7295e11656a6eea20b4
-  data.tar.gz: 1bf5fe5b0d56f12249090edfd84bd56a81ac18f05670259a7473d780648045e5
+  metadata.gz: 6c3f85e82470685a2ece6851d557bcaf03f5a77ce309d76062c3960ca17d1606
+  data.tar.gz: b6ab7bfb9d29feebf217b70b11ccf2f73e6fb0853138cc27f4556f07b6c36dac
 SHA512:
-  metadata.gz: 24bd03ffa04bdd43827923fbe411b8d05e74fad8f9bedd54511de71593d06a2b40e5289a15bc84d09ec9002b949a5b0e91a168cba3b451d003e54f36ecfa758a
-  data.tar.gz: 90dd57aee1a18163fc18b9027f45dbed3045183de4bc2d098cc895e90d3723c4512f00dce1255263dd08b11b449adc5f84f6de4da4a07ac9802e82ed22d571b0
+  metadata.gz: 96fbb4c5a42c1ab3f2fe590f3c74012b883c818608c5b9d0525f30739f1d4d8733c95cfffd31a8a05350d6210d995f84d915727a494264d1cb1c217d10d200b1
+  data.tar.gz: 12ae86ab8f26eb074eabb60cd3f831eed44729d98f70bdc88d1c0d9c3d5cff5680ae7cf0a9643756395e6cfc1257cb7fc62ee5abab4c37c6f0fe45817fc619a0

data/.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*.rb]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.github/workflows/ci.yml

@@ -0,0 +1,98 @@
+# Inspired from:
+# - https://github.com/cockroachdb/sqlalchemy-cockroachdb/blob/master/.github/workflows/ci.yml
+# - https://github.com/rgeo/activerecord-postgis-adapter/blob/master/.github/workflows/tests.yml
+name: Test
+
+on:
+  push:
+    branches: [master]
+  # Triggers the workflow on pull request events.
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# This allows a subsequently queued workflow run to interrupt previous runs.
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref }}"
+  cancel-in-progress: true
+
+jobs:
+  # Since the name of the matrix job depends on the version, we define another job with a more stable name.
+  test_results:
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    name: Test Results
+    needs: [test]
+    steps:
+      - run: |
+          result="${{ needs.test.result }}"
+          if [[ $result == "success" || $result == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        crdb: [v23.1.11]
+        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
+      - name: Set Up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install and Start Cockroachdb
+        run: |
+          # Download CockroachDB
+          wget -qO- https://binaries.cockroachdb.com/cockroach-${{ matrix.crdb }}.linux-amd64.tgz | tar xvz
+
+          export PATH=./cockroach-${{ matrix.crdb }}.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 &
+          # Ensure CockroachDB is stopped on script exit.
+          # Wait until CockroachDB has started.
+          for i in {0..3}; do
+            [[ -f "$urlfile" ]] && break
+            backoff=$((2 ** i))
+            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';
+          "
+      - name: Test
+        run: bundle exec rake test TESTOPTS='--profile=3'

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 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.0 - 2024-01-30
+
+- Add support for Rails 7.1 ([#300](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/300)).
+
+## 7.0.3 - 2023-08-23
+
+- Fix Multiple Database connections ([#283](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/)).
+- Add support for sql load in rake tasks ([#275](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/)).
+- Add support for sql dump in rake tasks ([#273](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/)).
+- Add support for table optimize hints ([#266](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/)).
+
 ## 7.0.2 - 2023-05-23
 
 - Fix default numbers test to expect the correct result after

data/CONTRIBUTING.md

@@ -15,12 +15,15 @@ override and monkey-patch functionality.
 
 ## Setup and running tests
 
-In CockroachDB, create two databases to be used by the ActiveRecord test suite:
+### CockroachDB
+
+First, You should setup a cockroachdb local instance. You can use the
+`bin/start-cockroachdb` to help you with that task. Otherwise, once setup,
+create two databases to be used by the ActiveRecord test suite:
 activerecord_unittest and activerecord_unittest2.
 
 ```sql
 CREATE DATABASE activerecord_unittest;
-
 CREATE DATABASE activerecord_unittest2;
 ```
 
@@ -87,12 +90,6 @@ To run a specific test case, use minitest's `-n` option to run tests that match
 TEST_FILES="test/cases/adapter_test.rb" TESTOPTS=`-n=/test_indexes/` bundle exec rake test
 ```
 
-By default, tests will be run from the bundled version of Rails. To run against a local copy, set environemnt variable `RAILS_SOURCE`. Running against a local copy of Rails can be helpful when try to debug issues.
-
-```bash
-RAILS_SOURCE="path/to/local_copy" bundle exec rake test
-```
-
 `test/config.yml` assumes CockroachDB will be running at localhost:26257 with a root user. Make changes to `test/config.yml` as needed.
 
 ### Run Tests from a Backup
@@ -117,23 +114,6 @@ And the `activerecord_unittest` database will use the `RESTORE` command to load
 
 # Improvements
 
-
-## Support past Rails versions
-
-Currently, only a beta version of Rails is tested. This means that the
-adapter has been modified in to accommodate unreleased changes. In order
-to run the tests for Rails 5.1 or 4.2, the test changes will need to be
-cherry-picked back. Conflicts are mostly only expected for tests that
-have not yet been added.
-
-Sadly, this does mean that we will have to have multiple versions of the
-driver for the multiple versions of Rails.
-
-A proposal for the CockroachDB adapter versioning would be to follow
-ActiveRecord minor versions. For example, if you use Rails 4.2.5, you
-would specify the CockroachDB version `~> 4.2.0`.
-
-
 ## Running CI automatically
 
 Currently the fork is set up to run using TeamCity only on the current
@@ -247,7 +227,7 @@ need to be cleaned up.
 
 # Notes for the non-Rubyer
 
-rvm is an environment manager that lets you manage and swap between
+rbenv is an environment manager that lets you manage and swap between
 multiple versions of Ruby and their dependencies.
 
 bundle is dependency manager that uses a projects `Gemfile` (and often

data/Gemfile

@@ -1,60 +1,60 @@
-require 'openssl'
-source 'https://rubygems.org'
-gemspec
+# frozen_string_literal: true
 
-if ENV['RAILS_SOURCE']
-  gemspec path: ENV['RAILS_SOURCE']
-else
-  def get_version_from_gemspec
-    gemspec = eval(File.read('activerecord-cockroachdb-adapter.gemspec'))
+source "https://rubygems.org"
 
-    gem_version = gemspec.dependencies.
-      find { |dep| dep.name == 'activerecord' }.
-      requirement.
-      requirements.
-      first.
-      last
+gemspec
 
-    major, minor, tiny, pre = gem_version.segments
 
-    if pre
-      gem_version.to_s
-    else
-      find_latest_matching_version(major, minor)
+module RailsTag
+  class << self
+    def call
+      req = gemspec_requirement
+      "v" + all_activerecord_versions.find { req.satisfied_by?(_1) }.version
+    rescue => e
+      warn "Unable to determine Rails version. Using last used. Error: #{e.message}"
+      lockfile = File.expand_path("Gemfile.lock", __dir__)
+      File.foreach(lockfile, chomp: true).find { _1[/tag: (.*)$/] }
+      Regexp.last_match(1)
     end
-  end
 
-  def find_latest_matching_version(gemspec_major, gemspec_minor)
-    all_activerecord_versions.
-      reject { |version| version["prerelease"] }.
-      map { |version| version["number"].split(".").map(&:to_i) }.
-      find { |major, minor|
-        major == gemspec_major && (minor == gemspec_minor || gemspec_minor.nil?)
-      }.join(".")
-  end
+    def gemspec_requirement
+      File
+        .foreach(File.expand_path("activerecord-cockroachdb-adapter.gemspec", __dir__), chomp: true)
+        .find { _1[/add_dependency\s.activerecord.,\s.(.*)./] }
 
-  def all_activerecord_versions
-    require 'net/http'
-    require 'yaml'
+      Gem::Requirement.new(Regexp.last_match(1))
+    end
 
-    uri = URI.parse "https://rubygems.org/api/v1/versions/activerecord.yaml"
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    def all_activerecord_versions
+      require 'net/http'
+      require 'yaml'
 
-    YAML.load(
-      http.request(Net::HTTP::Get.new(uri.request_uri)).body
-    )
-  end
+      uri = URI.parse "https://rubygems.org/api/v1/versions/activerecord.yaml"
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-  # Get Rails from source because the gem doesn't include tests
-  version = ENV['RAILS_VERSION'] || get_version_from_gemspec
-  gem 'rails', git: "https://github.com/rails/rails.git", tag: "v#{version}"
+      YAML.load(
+        http.request(Net::HTTP::Get.new(uri.request_uri)).body
+      ).map { Gem::Version.new(_1["number"]) }
+    end
+  end
 end
 
-group :development do
-  gem "byebug"
+
+group :development, :test do
+  # We need to load the gem from git to have access to activerecord's test files.
+  # You can use `path: "some/local/rails"` if you want to test the gem against
+  # a specific rails codebase.
+  gem "rails", github: "rails/rails", tag: RailsTag.call
+
+  # Needed for the test suite
+  gem "msgpack", ">= 1.7.0"
+
+  gem "rake"
+  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"
 
   # Gems used by the ActiveRecord test suite
   gem "bcrypt", "~> 3.1.18"

data/README.md

@@ -321,7 +321,7 @@ p modified_fac.parse_wkt(wkt)
 #=>  #<RGeo::Geographic::SphericalPolygonImpl>
 ```
 
-Be careful when performing calculations on potentially invalid geometries, as the results might be nonsensical. For example, the area returned of an hourglass made of 2 equivalent triangles with a self-intersection in the middle is 0. 
+Be careful when performing calculations on potentially invalid geometries, as the results might be nonsensical. For example, the area returned of an hourglass made of 2 equivalent triangles with a self-intersection in the middle is 0.
 
 Note that when using the `spherical_factory`, there is a chance that valid geometries will be interpreted as invalid due to floating point issues with small geometries.
 

data/Rakefile

@@ -4,14 +4,12 @@ require_relative 'test/support/paths_cockroachdb'
 require_relative 'test/support/rake_helpers'
 require_relative 'test/support/template_creator'
 
-task test: ["test:cockroachdb"]
 task default: [:test]
 
 namespace :db do
   task "create_test_template" do
     ENV['DEBUG_COCKROACHDB_ADAPTER'] = "1"
     ENV['COCKROACH_SKIP_LOAD_SCHEMA'] = "1"
-    ENV["ARCONN"] = "cockroachdb"
 
     TemplateCreator.connect
     require_relative 'test/cases/helper'
@@ -26,17 +24,9 @@ namespace :db do
   end
 end
 
-namespace :test do
-  Rake::TestTask.new("cockroachdb") do |t|
-    t.libs = ARTest::CockroachDB.test_load_paths
-    t.test_files = test_files
-    t.warning = !!ENV["WARNING"]
-    t.verbose = false
-  end
-
-  task "cockroachdb:env" do
-    ENV["ARCONN"] = "cockroachdb"
-  end
+Rake::TestTask.new do |t|
+  t.libs = ARTest::CockroachDB.test_load_paths
+  t.test_files = RakeHelpers.test_files
+  t.warning = !!ENV["WARNING"]
+  t.verbose = false
 end
-
-task 'test:cockroachdb' => 'test:cockroachdb:env'

data/activerecord-cockroachdb-adapter.gemspec

@@ -1,9 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require './lib/version.rb'
+require_relative 'lib/version'
 version = ActiveRecord::COCKROACH_DB_ADAPTER_VERSION
 
 Gem::Specification.new do |spec|
@@ -17,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Allows the use of CockroachDB as a backend for ActiveRecord and Rails apps."
   spec.homepage      = "https://github.com/cockroachdb/activerecord-cockroachdb-adapter"
 
-  spec.add_dependency "activerecord", "~> 7.0.3"
+  spec.add_dependency "activerecord", "~> 7.1.0"
   spec.add_dependency "pg", "~> 1.2"
   spec.add_dependency "rgeo-activerecord", "~> 7.0.0"
 

data/bin/console

@@ -1,14 +1,34 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "activerecord/cockroachdb"
+$:.unshift(File.expand_path("../lib", __dir__))
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+# require "bundler/setup"
+# Bundler.require :development
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "active_record"
+# This allows playing with the rake task as well. Ex:
+#
+#     ActiveRecord::Tasks::DatabaseTasks.
+#       structure_load(Post.connection_db_config, "awesome-file.sql")
+require "active_record/connection_adapters/cockroachdb/database_tasks"
+
+schema_kind = ENV.fetch("SCHEMA_KIND", "default")
+
+system("cockroach sql --insecure --host=localhost:26257 --execute='drop database if exists ar_crdb_console'",
+  exception: true)
+system("cockroach sql --insecure --host=localhost:26257 --execute='create database ar_crdb_console'",
+  exception: true)
+
+ActiveRecord::Base.establish_connection(
+  #Alternative version:  "cockroachdb://root@localhost:26257/ar_crdb_console"
+  adapter: "cockroachdb",
+  host: "localhost",
+  port: 26257,
+  user: "root",
+  database: "ar_crdb_console"
+)
+
+load "#{__dir__}/console_schemas/#{schema_kind}.rb"
 
 require "irb"
 IRB.start(__FILE__)

data/bin/console_schemas/default.rb

@@ -0,0 +1,9 @@
+class Post < ActiveRecord::Base
+end
+
+ActiveRecord::Schema.define do
+  create_table("posts") do |t|
+    t.string :title
+    t.text :body
+  end
+end

data/bin/console_schemas/schemas.rb

@@ -0,0 +1,23 @@
+class Post < ActiveRecord::Base
+  self.table_name = "bar.posts"
+end
+
+class Comment < ActiveRecord::Base
+  self.table_name = "foo.comments"
+end
+
+ActiveRecord::Schema.define do
+  create_schema("foo")
+  create_schema("bar")
+  create_table("bar.posts") do |t|
+    t.string :title
+    t.text :body
+  end
+
+  create_table("foo.comments") do |t|
+    t.integer :post_id
+    t.text :body
+  end
+
+  add_foreign_key "foo.comments", "bar.posts", column: "post_id"
+end

data/bin/start-cockroachdb

@@ -0,0 +1,48 @@
+#!/usr/bin/env zsh
+
+set -eu
+
+die() { echo "$0: $*" 1>&2 ; false; }
+
+root_dir="$(dirname $(dirname "$0:A"))"
+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")
+rm -f "$pid_file"
+
+if ! (( ${+commands[cockroach]} )); then
+	die 'the `cockroach` toolchain is not installed.
+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" \
+	&> "$log_file" &
+
+until [[ -f "$pid_file" ]]; do
+	sleep 1
+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
+
+echo "CockroachDB started. PID: $(cat "$pid_file"). log: $log_file"

data/build/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile extends the Examples-ORM testing image in order to
 # install specific dependencies required for ActiveRecord tests.
 
-FROM cockroachdb/example-orms-builder:20200413-1918
+FROM us-east1-docker.pkg.dev/crl-ci-images/cockroach/example-orms-builder:20200413-1918
 
 # Native dependencies for libxml-ruby and sqlite3.
 RUN apt-get --allow-releaseinfo-change update -y && apt-get install -y \

data/build/teamcity-test.sh

@@ -70,12 +70,7 @@ run_cockroach
 
 if ! (RUBYOPT="-W0" TESTOPTS="-v" bundle exec rake test); then
     echo "Tests failed"
-    HAS_FAILED=1
-else
-    echo "Tests passed"
-    HAS_FAILED=0
+    exit 1
 fi
 
-if [ $HAS_FAILED -eq 1 ]; then
-  exit 1
-fi
+echo "Tests passed"

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

@@ -22,6 +22,14 @@ module Arel # :nodoc:
   module Visitors # :nodoc:
     class CockroachDB < PostgreSQL  # :nodoc:
       include RGeo::ActiveRecord::SpatialToSql
+
+      def visit_Arel_Nodes_JoinSource(o, collector)
+        super
+        if o.aost
+          collector << " AS OF SYSTEM TIME '#{o.aost.iso8601}'"
+        end
+        collector
+      end
     end
   end
 end

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

@@ -1,11 +1,11 @@
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDB
-      module PostgreSQLColumnMonkeyPatch
+      class Column < PostgreSQL::Column
         # most functions taken from activerecord-postgis-adapter spatial_column
         # https://github.com/rgeo/activerecord-postgis-adapter/blob/master/lib/active_record/connection_adapters/postgis/spatial_column.rb
         def initialize(name, default, sql_type_metadata = nil, null = true,
-                       default_function = nil, collation: nil, comment: nil,
+                       default_function = nil, collation: nil, comment: nil, identity: nil,
                        serial: nil, spatial: nil, generated: nil, hidden: nil)
           @sql_type_metadata = sql_type_metadata
           @geographic = !!(sql_type_metadata.sql_type =~ /geography\(/i)
@@ -30,7 +30,7 @@ module ActiveRecord
             build_from_sql_type(sql_type_metadata.sql_type)
           end
           super(name, default, sql_type_metadata, null, default_function,
-            collation: collation, comment: comment, serial: serial, generated: generated)
+            collation: collation, comment: comment, serial: serial, generated: generated, identity: identity)
           if spatial? && @srid
             @limit = { srid: @srid, type: to_type_name(geometric_type) }
             @limit[:has_z] = true if @has_z
@@ -53,10 +53,6 @@ module ActiveRecord
           spatial? ? @limit : super
         end
 
-        def virtual?
-          @generated.present?
-        end
-
         def hidden?
           @hidden
         end
@@ -93,9 +89,5 @@ module ActiveRecord
         end
       end
     end
-
-    class PostgreSQLColumn
-      prepend CockroachDB::PostgreSQLColumnMonkeyPatch
-    end
   end
 end

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

@@ -45,6 +45,14 @@ module ActiveRecord
         def st_polygon(name, options = {})
           column(name, :st_polygon, **options)
         end
+
+        private
+
+        def valid_column_definition_options
+          spatial = [:srid, :has_z, :has_m, :geographic, :spatial_type]
+          crdb = [:hidden]
+          super + spatial + crdb
+        end
       end
     end