activerecord-cockroachdb-adapter 7.1.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672289521537934d4b9ed2d707c3faf55b4761c8d2b4e9e12cd8622166963ae7
-  data.tar.gz: 345a84d7c5bca0d574aa65eb0fb0e30986a23fcc2830f422e5b1d80ffa971076
+  metadata.gz: 496e736f6d7baf4f0acb18461a70d7686765262e3fd09f4a65ac49534582d871
+  data.tar.gz: 9bd072d1ac20b7f1099076fb5019c9cfbee305da4463de7f91ec493c8f6eebe3
 SHA512:
-  metadata.gz: 4ce6d2119bfc27192630c32ec488b3e7f533cc64963fc04035609122e5bdbc33e75b83766ca68e3eb73e2592b2fe0a1bae53a74389527762f790b16bda687da9
-  data.tar.gz: 42e10ab1106e4ffc4df89bbbf98f8ddbd05b6bccf97b062a9445ebf874a8bfef9e628dce8b39c3287424a7094f70790457293a2766a849bd39ac0e20c7a684fe
+  metadata.gz: '044899369534c133039634cc835ce3efd71500a527d9249b10ca34fb8cb343f4754e0c72c8bc0f560267348881fe5d8e7701921b270431dfde1a810f1c48efad'
+  data.tar.gz: 5c67f56709062e0982998ff59f49f9caa1b14bb630e81339d6183821add59bfaf731f2af5e416b724fc00d3f57e17d63138eabec63166288185d69284bd53891

data/.github/workflows/ci.yml

@@ -40,8 +40,8 @@ jobs:
       fail-fast: false
       matrix:
         # https://www.cockroachlabs.com/docs/releases/release-support-policy
-        crdb: [v22.2, v23.1, v23.2]
-        ruby: [head]
+        crdb: [v23.2, v24.1, v24.2]
+        ruby: ["3.3"]
     name: Test (crdb=${{ matrix.crdb }} ruby=${{ matrix.ruby }})
     steps:
       - name: Set Up Actions
@@ -88,4 +88,4 @@ jobs:
           done
           cat ${{ github.workspace }}/setup.sql | cockroach sql --insecure
       - name: Test
-        run: bundle exec rake test TESTOPTS='--profile=3'
+        run: bundle exec rake test TESTOPTS='--profile=5'

data/.gitignore

@@ -15,3 +15,4 @@
 /docker_root/
 /ruby-build/
 /test/db/
+/.ruby-version

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Ongoing
 
+## 7.2.0 - 2024-09-24
+
+- Add support for Rails 7.2 ([#337](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/337))
+
 ## 7.1.1 - 2024-05-01
 
 - Enable precision support ([#318](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/318))

data/CONTRIBUTING.md

@@ -1,18 +1,5 @@
 # Getting started
 
-
-## ActiveRecord adapters and you
-
-There are two repositories for the ActiveRecord adapter. The one you're in
-currently, [activerecord-cockroachdb-adapter], is the CockroachDB specific
-ActiveRecord code. Users install this alongside ActiveRecord then use
-CockroachDBAdapter to initialize ActiveRecord for their projects.
-
-This adapter extends the PostgreSQL ActiveRecord adapter in order to
-override and monkey-patch functionality.
-
-[activerecord-cockroachdb-adapter]: https://github.com/cockroachdb/activerecord-cockroachdb-adapter/
-
 ## Setup and running tests
 
 ### CockroachDB
@@ -23,6 +10,7 @@ create two databases to be used by the ActiveRecord test suite:
 activerecord_unittest and activerecord_unittest2.
 
 ```sql
+-- See /setup.sql file for the whole setup.
 CREATE DATABASE activerecord_unittest;
 CREATE DATABASE activerecord_unittest2;
 ```
@@ -36,30 +24,6 @@ Ruby version.
 tests similarly to TeamCity. The database is destroyed between each
 test file.)
 
-Install rbenv with ruby-build on MacOS:
-
-```bash
-brew install rbenv ruby-build
-echo 'eval "$(rbenv init - zsh)"' >> ~/.profile
-```
-
-Install rbenv with ruby-build on Ubuntu:
-
-```bash
-sudo apt-get install rbenv
-echo 'eval "$(rbenv init - zsh)"' >> ~/.profile
-
-git clone https://github.com/sstephenson/ruby-build.git ~/ruby-build
-sh ~/ruby-build/install.sh
-```
-
-Use rbenv to install version of Ruby specified by `.ruby-version`.
-
-```bash
-rbenv install
-rbenv rehash
-```
-
 Using [bundler](http://bundler.io/), install the dependencies of Rails.
 
 ```bash
@@ -87,9 +51,12 @@ TEST_FILES="test/cases/adapter_test.rb,test/cases/associations/left_outer_join_a
 To run a specific test case, use minitest's `-n` option to run tests that match a given pattern. All minitest options are set via the `TESTOPTS` environemnt variable. For example, to run `test_indexes` from CockroachDB's `test/cases/adapter_test.rb` file
 
 ```bash
-TEST_FILES="test/cases/adapter_test.rb" TESTOPTS=`-n=/test_indexes/` bundle exec rake test
+TEST_FILES="test/cases/adapter_test.rb" TESTOPTS=`--name=/test_indexes/` bundle exec rake test
 ```
 
+You can also use the constant `COCKROACH_SKIP_LOAD_SCHEMA` to avoid reloading the schema every time (faster).
+Only do it if you know the schema was left in a correct state.
+
 `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
@@ -121,7 +88,6 @@ master branch, with an alpha build of CockroachDB. it would be even
 better to be able to test multiple versions of the adapter, and do so
 against different versions of CockroachDB.
 
-
 ## Adding feature support
 
 As CockroachDB improves, so do the features that can be supported in
@@ -131,15 +97,36 @@ gates should be toggled. Something that would help this process would be
 linking those issues back to this adapter so that part of the feature
 completing includes updating the adapter.
 
-
-## Execute only tests that run with a connection
-
-I have not investigated if this is already possible, but I would assume
-no.
-
-A possible way to approach this would be to add a shim to cause any
-tests that use it to fail, and grep the tests that pass and then skip
-them.
+## Upgrading Rails
+
+Whenever you upgrade rails version, loads of things will change.
+This section intent to help you with a checklist.
+
+- Check for TODO or NOTE tags that are referencing the old or new version of
+  rails.
+  ```bash
+  rg 'TODO|NOTE' --after-context=2
+  ```
+- Check postgresql_specific_schema.rb changelog in rails, and apply the changes
+  you want. Ex:
+  ```bash
+  git diff v7.1.4..v7.2.1 -- $(fd postgresql_specific_schema)
+  ```
+- Verify the written text at the beginning of the test suite, there are likely
+  some changes in excluded tests.
+- Check for some important methods, some will change for sure:
+  - [x] `def new_column_from_field(`
+  - [x] `def column_definitions(`
+  - [x] `def pk_and_sequence_for(`
+  - [ ] ...
+- Check for setups containing `drop_table` in the test suite.
+  Especially if you have tons of failure, this is likely the cause.
+- In the same way, run `test/cases/fixtures_test.rb` first, and check
+  if this corrupted the test database for other tests.
+- For both of the above, the diff of `schema.rb` can be useful:
+  ```bash
+  git diff v7.1.2..v7.2.1 -- activerecord/test/schema/schema.rb
+  ```
 
 ## Publishing to Rubygems
 
@@ -151,7 +138,6 @@ gem build ...
 gem publish <output file>
 ```
 
-
 # Notes
 
 When executing the test suite, each test file will reload fixtures. This
@@ -182,49 +168,8 @@ cleaned up, or skipped until passing.
 The purpose of these was to make the tests grep-able while going through
 all the failures.
 
-
 [cockroachdb/cockroach#20753]: https://github.com/cockroachdb/cockroach/issues/20753#issuecomment-352810425
 
-
-## Tracked test failures
-
-Some of the skipped failures are:
-
-- `default:` key is not working for columns in table schema
-  definitions. This causes tests to fail due to unexpected data.
-
-- `array:` key is not working for columns in table schema definitions.
-
-- `"Salary is not appearing in list"` is being raised in a number of
-  places. Likely during fixture setup.
-
-- `sum` function seems to result in a different type in ActiveRecord.
-  Instead of returning a Ruby `int`, it returns a Ruby `string`. It
-  appears that MySQL2 also does this. A suspected cause might be how
-  `Decimal` is handled if `sum` consumes integers and return a
-  decimal.
-
-- Potentially fork the PostgreSQL::SchemaDumper to handle anything
-  specific to CockroachDB, like primary keys or bigints.
-
-- You can call `@connection.create_table(..., id: :bigint)`, but this
-  will not changes things for CockroachDB (I think...), so it would be
-  not allowed. Even better, our adapter could interpret this and
-  generate the appropriate explicit pkey column. Not sure what string
-  pkeys look like...
-
-- `string` types are introspected to `text` types.
-
-- A user can do an update, delete, and insert on views.
-
-- Postgres specific bit strings are not properly supported.
-
-Grepping for `FIXME(joey)`, `TODO(joey)`, and `NOTE(joey)` will yeild
-most of the touchpoints including test failures and temporary monkey
-patches. Some monkey patches were made directly to Rails, which will
-need to be cleaned up.
-
-
 # Notes for the non-Rubyer
 
 rbenv is an environment manager that lets you manage and swap between

data/Gemfile

@@ -50,6 +50,7 @@ group :development, :test do
 
   # Needed for the test suite
   gem "msgpack", ">= 1.7.0"
+  gem "mutex_m", "~> 0.2.0"
 
   gem "rake"
   gem "debug"
@@ -61,9 +62,8 @@ group :development, :test do
   gem "parser"
 
   # Gems used by the ActiveRecord test suite
-  gem "bcrypt", "~> 3.1.18"
-  gem "mocha", "~> 1.14.0"
-  gem "sqlite3", "~> 1.4.4"
+  gem "bcrypt", "~> 3.1"
+  gem "sqlite3", "~> 1.4"
 
-  gem "minitest", "~> 5.15.0"
+  gem "minitest", "~> 5.15"
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -199,4 +199,3 @@ Apache License
    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.
-

data/README.md

@@ -1,20 +1,22 @@
 # ActiveRecord CockroachDB Adapter
 
-CockroachDB adapter for ActiveRecord 5, 6, and 7. This is a lightweight extension of the PostgreSQL adapter that establishes compatibility with [CockroachDB](https://github.com/cockroachdb/cockroach).
+CockroachDB adapter for ActiveRecord. This is a lightweight extension
+of the PostgreSQL adapter that establishes compatibility with [CockroachDB](https://github.com/cockroachdb/cockroach).
 
 ## Installation
 
 Add this line to your project's Gemfile:
 
 ```ruby
-gem 'activerecord-cockroachdb-adapter', '~> 7.0.0'
+gem 'activerecord-cockroachdb-adapter', '~> 7.2.0'
 ```
 
-If you're using Rails 5.2, use the `5.2.x` versions of this gem.
+If you're using Rails 7.0, use the `7.0.x` versions of this gem.
 
-If you're using Rails 6.0, use the `6.0.x` versions of this gem.
+If you're using Rails 7.1, use the `7.1.x` versions of this gem.
 
-If you're using Rails 7.0, use the `7.0.x` versions of this gem.
+If you're using Rails 7.2, use the `7.2.x` versions of this gem.
+The minimal CockroachDB version required is 23.1.12 for this version.
 
 In `database.yml`, use the following adapter setting:
 

data/activerecord-cockroachdb-adapter.gemspec

@@ -14,8 +14,8 @@ 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.1.0"
-  spec.add_dependency "pg", "~> 1.2"
+  spec.add_dependency "activerecord", "~> 7.2.0"
+  spec.add_dependency "pg", "~> 1.5"
   spec.add_dependency "rgeo-activerecord", "~> 7.0.0"
 
   spec.add_development_dependency "benchmark-ips", "~> 2.9.1"

data/bin/console

@@ -5,7 +5,7 @@ $:.unshift(File.expand_path("../lib", __dir__))
 # require "bundler/setup"
 # Bundler.require :development
 
-require "active_record"
+require "activerecord-cockroachdb-adapter"
 # This allows playing with the rake task as well. Ex:
 #
 #     ActiveRecord::Tasks::DatabaseTasks.

data/lib/active_record/connection_adapters/cockroachdb/arel_tosql.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 RGeo
   module ActiveRecord
     ##

data/lib/active_record/connection_adapters/cockroachdb/attribute_methods.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 CockroachDB
     module AttributeMethodsMonkeyPatch

data/lib/active_record/connection_adapters/cockroachdb/column.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/column_methods.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/database_statements.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/database_tasks.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/base"
 
 module ActiveRecord
@@ -21,14 +37,14 @@ module ActiveRecord
               ActiveRecord.dump_schemas
             end
 
-          conn = ActiveRecord::Base.connection
+          conn = ActiveRecord::Base.lease_connection
           begin
             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 }
+                conn.execute("SHOW CREATE ALL #{object_kind}").each_row { file.puts _1 }
               end
 
               ignore_tables = ActiveRecord::SchemaDumper.ignore_tables.to_set

data/lib/active_record/connection_adapters/cockroachdb/oid/date_time.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/oid/interval.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.
+
 # frozen-string-literal: true
 
 require "active_support/duration"

data/lib/active_record/connection_adapters/cockroachdb/oid/spatial.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/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,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
@@ -39,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

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,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.
+
 require "rgeo/active_record"
 
 require_relative "../../arel/nodes/join_source_ext"
@@ -31,20 +45,6 @@ require_relative "../relation/query_methods_ext"
 # Defined in ./setup.rb
 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)
-      cockroachdb_adapter_class.new(config)
-    end
-  end
-end
-
 module ActiveRecord
   module ConnectionAdapters
     module CockroachDBConnectionPool
@@ -137,15 +137,23 @@ module ActiveRecord
       end
 
       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
+        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_datetime_with_precision?
         # https://github.com/cockroachdb/cockroach/pull/111400
-        database_version >= 23_01_13
+        true
       end
 
       def supports_nulls_not_distinct?
@@ -162,7 +170,7 @@ module ActiveRecord
       end
 
       def supports_materialized_views?
-        false
+        true
       end
 
       def supports_index_include?
@@ -201,50 +209,44 @@ module ActiveRecord
       end
 
       def supports_deferrable_constraints?
+        # https://go.crdb.dev/issue-v/31632/v23.1
         false
       end
 
-      # 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 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
+      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
 
-      def initialize(...)
+      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.
+      #
+      # 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
-        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
+        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
@@ -292,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.
             #
@@ -511,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 = {
@@ -526,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(", ")
@@ -533,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

data/lib/activerecord-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.
+
 if defined?(Rails::Railtie)
   module ActiveRecord
     module ConnectionAdapters
@@ -9,3 +25,8 @@ if defined?(Rails::Railtie)
     end
   end
 end
+
+require "active_record"
+require "active_record/connection_adapters"
+
+ActiveRecord::ConnectionAdapters.register "cockroachdb", "ActiveRecord::ConnectionAdapters::CockroachDBAdapter", "active_record/connection_adapters/cockroachdb_adapter"

data/lib/arel/nodes/join_source_ext.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 Arel
   module Nodes
     module JoinSourceExt

data/lib/version.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
-  COCKROACH_DB_ADAPTER_VERSION = "7.1.1"
+  COCKROACH_DB_ADAPTER_VERSION = "7.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.0
 platform: ruby
 authors:
 - Cockroach Labs
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,6 @@ files:
 - ".github/workflows/docker.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -128,7 +127,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: CockroachDB adapter for ActiveRecord.
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-3.2.3