activerecord-cockroachdb-adapter 6.1.10 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a654c4b06b42fbaae48bc9610420b2103f38b72d4170b7ae59983860d6e9d6
-  data.tar.gz: fb400dec89ffb39d202a081ff09a34330a498e3e9ce4363433d55de255a0288a
+  metadata.gz: 829d7c6d923f6d2949dfcca1c946be01286b79f643987696b0d271c696e3c55d
+  data.tar.gz: 558689db88c43aaa1fe4d10216796ee2754d9b206cc56feb846b0ca2e05e745c
 SHA512:
-  metadata.gz: f39c8a1fb5da46833e2ebb25a7224fd4c7d6bf1b71649d06550e60bd00e6dc084ef6675d9314995a002a507aa3e382efb7947fdc951221612fbc12b730b95fed
-  data.tar.gz: b133873824c59d673b9aed7a8cb45933aa7298bf9b5dc533240e9e43e99820ab1abe0be09874a9d0f5b6f7ce599441b7c1e462ecc83754f0de87dab9ca8ce50b
+  metadata.gz: 6b3ad08b9912080c5f324ef1b244e5f9d1ed22cd1e63f3c9ee9623399e5c92e12000681b0988e533a19e4e403325a13a419e534499c2d3fd6316b36525be57d9
+  data.tar.gz: c77f0016087842bdcfd7d8cbb0989b687653dcc4e6ce3e5c618b2fe2f1a44e1c995b84836235ba497f7623713987180796c1d07ae639f16dd4be6af747c1e9a4

data/.github/workflows/docker.yml

@@ -0,0 +1,57 @@
+# This workflow is based off of the example at
+# https://github.com/docker/metadata-action
+#
+# Multi-platform configuration from
+# https://github.com/docker/build-push-action/blob/master/docs/advanced/multi-platform.md
+#
+# Caching from
+# https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md
+name: Docker
+permissions:
+  contents: read
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'build/Dockerfile'
+  # Only build, but don't push, on a PR if it touches the Dockerfile,
+  # since this takes a while to execute.
+  pull_request:
+    paths:
+      - 'build/Dockerfile'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: cockroachdb/activerecord_test_container
+          labels: |
+            org.opencontainers.image.title=Active Record CockroachDB Adapter Test Image
+            org.opencontainers.image.vendor=Cockroach Labs Inc.
+            org.opencontainers.image.description=Environment for running tests
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: build/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

data/.gitignore

@@ -8,3 +8,10 @@
 /spec/reports/
 /tmp/
 *.gem
+/debug.log
+/cockroach-url
+/cockroach-data/
+/cockroach-*.linux-amd64/
+/docker_root/
+/ruby-build/
+/test/db/

data/.ruby-version

@@ -0,0 +1 @@
+3.2.1

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 7.0.1 - 2023-03-24
+
+- Reconnect on retryable connection errors.
+
+## 7.0.0 - 2022-06-02
+
+- Add support for Active Record 7.0.3
+
 ## 6.1.10 - 2022-05-06
 
 - Disable supports_expression_index regardless of CockroachDB version until
@@ -46,7 +54,7 @@
 
 ## 6.1.1 - 2021-05-14
 
-- Fix a bug where starting the driver can result in a NoDatabaseError. 
+- Fix a bug where starting the driver can result in a NoDatabaseError.
 
 ## 6.1.0 - 2021-04-26
 

data/CONTRIBUTING.md

@@ -25,22 +25,39 @@ CREATE DATABASE activerecord_unittest2;
 ```
 
 It is best to have a Ruby environment manager installed, such as
-[rvm](https://rvm.io/), as Rails has varying Ruby version requirements.
-If you are using rvm, you then install and use the required Ruby
-version.  The current tests use Rails 5.2.0 beta and Ruby >= 2.2.2.
+[rbenv](https://github.com/rbenv/rbenv), as Rails has varying Ruby version
+requirements. If you are using rbenv, you then install and use the required
+Ruby version.
 
 (Alternatively, one can use `./docker.sh build/teamcity-test.sh` to run
-tests similarily to TeamCity. The database is destroyed between each
+tests similarly to TeamCity. The database is destroyed between each
 test file.)
 
+Install rbenv with ruby-build on MacOS:
 
 ```bash
-rvm install 2.2.5
-# This only makes Ruby 2.2.5 active for the length of the terminal session.
-rvm use 2.2.5
+brew install rbenv ruby-build
+echo 'eval "$(rbenv init - zsh)"' >> ~/.profile
 ```
 
-Using [bundler](http://bundler.io/), install the dependancies of Rails.
+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
 bundle install
@@ -52,13 +69,13 @@ Then, to run the full test suite with an active CockroachDB instance:
 bundle exec rake test
 ```
 
-To run specific ActiveRecord tests, set environemnt variable `TEST_FILES_AR`. For example, to run ActiveRecord tests `test/cases/associations_test.rb` and `test/cases/ar_schema_test.rb.rb`
+To run specific ActiveRecord tests, set environment variable `TEST_FILES_AR`. For example, to run ActiveRecord tests `test/cases/associations_test.rb` and `test/cases/ar_schema_test.rb.rb`
 
 ```bash
 TEST_FILES_AR="test/cases/associations_test.rb,test/cases/ar_schema_test.rb" bundle exec rake test
 ```
 
-To run specific CockroachDB Adapter tests, set environemnt variable `TEST_FILES`. For example, to run CockroachDB Adpater tests `test/cases/adapter_test.rb` and `test/cases/associations/left_outer_join_association_test.rb`
+To run specific CockroachDB Adapter tests, set environment variable `TEST_FILES`. For example, to run CockroachDB Adpater tests `test/cases/adapter_test.rb` and `test/cases/associations/left_outer_join_association_test.rb`
 
 ```bash
 TEST_FILES="test/cases/adapter_test.rb,test/cases/associations/left_outer_join_association_test.rb" bundle exec rake test
@@ -104,7 +121,7 @@ And the `activerecord_unittest` database will use the `RESTORE` command to load
 ## Support past Rails versions
 
 Currently, only a beta version of Rails is tested. This means that the
-adapter has been modified in to accomodate unreleased changes. In order
+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.
@@ -129,7 +146,7 @@ against different versions of CockroachDB.
 
 As CockroachDB improves, so do the features that can be supported in
 ActiveRecord. Many of them are gated by conditions the
-CockroachDBAdapter has overrided. As these features are completed, these
+CockroachDBAdapter has overridden. As these features are completed, these
 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.
@@ -231,10 +248,10 @@ need to be cleaned up.
 # Notes for the non-Rubyer
 
 rvm is an environment manager that lets you manage and swap between
-multiple verisons of Ruby and their dependancies.
+multiple versions of Ruby and their dependencies.
 
-bundle is dependancy manager that uses a projects `Gemfile` (and often
-`<project>.gemspec`) to manage and load dependancies and their required
+bundle is dependency manager that uses a projects `Gemfile` (and often
+`<project>.gemspec`) to manage and load dependencies and their required
 versions. When using projects commands are prefixed with
-`bundle exec ...`. Bundle will ensure that all depenedncies are fetched
+`bundle exec ...`. Bundle will ensure that all dependencies are fetched
 and used.

data/Gemfile

@@ -47,17 +47,19 @@ else
     )
   end
 
-  # Get Rails from source beacause the gem doesn't include tests
+  # 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}"
 end
 
 group :development do
   gem "byebug"
-  gem "minitest-excludes"
+  gem "minitest-excludes", "~> 2.0.1"
 
   # Gems used by the ActiveRecord test suite
-  gem "bcrypt"
-  gem "mocha"
-  gem "sqlite3"
+  gem "bcrypt", "~> 3.1.18"
+  gem "mocha", "~> 1.14.0"
+  gem "sqlite3", "~> 1.4.4"
+
+  gem "minitest", "~> 5.15.0"
 end

data/README.md

@@ -1,19 +1,21 @@
 # ActiveRecord CockroachDB Adapter
 
-CockroachDB adapter for ActiveRecord 5 and 6. This is a lightweight extension of the PostgreSQL adapter that establishes compatibility with [CockroachDB](https://github.com/cockroachdb/cockroach).
+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).
 
 ## Installation
 
 Add this line to your project's Gemfile:
 
 ```ruby
-gem 'activerecord-cockroachdb-adapter', '~> 6.1.0'
+gem 'activerecord-cockroachdb-adapter', '~> 7.0.0'
 ```
 
 If you're using Rails 5.2, use the `5.2.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.0, use the `7.0.x` versions of this gem.
+
 In `database.yml`, use the following adapter setting:
 
 ```

data/activerecord-cockroachdb-adapter.gemspec

@@ -17,10 +17,12 @@ 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", "~> 6.1"
+  spec.add_dependency "activerecord", "~> 7.0.3"
   spec.add_dependency "pg", "~> 1.2"
   spec.add_dependency "rgeo-activerecord", "~> 7.0.0"
 
+  spec.add_development_dependency "benchmark-ips", "~> 2.9.1"
+
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)

data/build/Dockerfile

@@ -8,10 +8,7 @@ RUN apt-get --allow-releaseinfo-change update -y && apt-get install -y \
   libxslt-dev \
   libxml2-dev \
   libsqlite3-dev \
+  rbenv \
   && rm -rf /var/lib/apt/lists/*
 
-# Ruby testing dependencies.
-RUN gem install bundle rake
-
-# Add global Gem binaries to the path.
-ENV PATH /usr/local/lib/ruby/gems/2.4.0::$PATH
+RUN rm -rf ~/ruby-build; git clone https://github.com/sstephenson/ruby-build.git ~/ruby-build; sh ~/ruby-build/install.sh

data/build/local-test.sh

@@ -11,7 +11,6 @@ rm -f "$urlfile"
 # canceled on an agent.
 rm -rf $HOME/tmp/rails &
 # Start CockroachDB.
-cockroach quit --insecure || true
 cockroach start --insecure --host=localhost --listening-url-file="$urlfile" --store=path=$HOME/tmp/rails &
 trap "echo 'Exit routine: Killing CockroachDB.' && kill -9 $! &> /dev/null" EXIT
 for i in {0..3}
@@ -31,8 +30,3 @@ echo "Rebuilding database"
 (cd rails/activerecord && bundle exec rake db:cockroachdb:rebuild)
 echo "Starting tests"
 (cd rails/activerecord && bundle exec rake test:cockroachdb TESTFILES=$1)
-
-# Attempt a clean shutdown for good measure. We'll force-kill in the atexit
-# handler if this fails.
-cockroach quit --insecure
-trap - EXIT

data/build/teamcity-test.sh

@@ -2,9 +2,17 @@
 
 set -euox pipefail
 
+eval "$(rbenv init -)"
+
+rbenv install --skip-existing --verbose
+
+rbenv rehash
+
+ruby -v
+
 # Download CockroachDB
-VERSION=v21.2.5
-wget -qO- https://binaries.cockroachdb.com/cockroach-$VERSION.linux-amd64.tgz | tar  xvz
+VERSION=v22.2.6
+wget -qO- https://binaries.cockroachdb.com/cockroach-$VERSION.linux-amd64.tgz | tar xvz
 readonly COCKROACH=./cockroach-$VERSION.linux-amd64/cockroach
 
 # Make sure cockroach can be found on the path. This is required for the
@@ -16,9 +24,6 @@ run_cockroach() {
   # Start a CockroachDB server, wait for it to become ready, and arrange
   # for it to be force-killed when the script exits.
   rm -f "$urlfile"
-  # Clean out a past CockroachDB instance. This will clean out leftovers
-  # from the build agent, and also between CockroachDB runs.
-  cockroach quit --insecure || true
   rm -rf cockroach-data
   # Start CockroachDB.
   cockroach start-single-node --max-sql-memory=25% --cache=25% --insecure --host=localhost --spatial-libs=./cockroach-$VERSION.linux-amd64/lib --listening-url-file="$urlfile" >/dev/null 2>&1 &
@@ -35,6 +40,8 @@ run_cockroach() {
   cockroach sql --insecure -e 'CREATE DATABASE activerecord_unittest2;'
   cockroach sql --insecure -e 'SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;'
   cockroach sql --insecure -e 'SET CLUSTER SETTING sql.stats.histogram_collection.enabled = false;'
+  cockroach sql --insecure -e "SET CLUSTER SETTING jobs.retention_time = '180s';"
+  cockroach sql --insecure -e "SET CLUSTER SETTING sql.defaults.experimental_alter_column_type.enabled = 'true'"
 
   cockroach sql --insecure -e "ALTER RANGE default CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;"
   cockroach sql --insecure -e "ALTER TABLE system.public.jobs CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;"
@@ -46,21 +53,17 @@ run_cockroach() {
   cockroach sql --insecure -e "SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = 'true'"
   cockroach sql --insecure -e "SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';"
   cockroach sql --insecure -e "SET CLUSTER SETTING jobs.registry.interval.gc = '30s';"
-  cockroach sql --insecure -e "SET CLUSTER SETTING jobs.retention_time = '15s';"
-  cockroach sql --insecure -e "SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;"
   cockroach sql --insecure -e "SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';"
 
-  # Enable when we test with v22.1.
-  # cockroach sql --insecure -e "SET CLUSTER SETTING sql.catalog.unsafe_skip_system_config_trigger.enabled = true;"
-
   # Enable experimental features.
   cockroach sql --insecure -e "SET CLUSTER SETTING sql.defaults.experimental_temporary_tables.enabled = 'true';"
-  cockroach sql --insecure -e "SET CLUSTER SETTING sql.defaults.datestyle.enabled = true"
-  cockroach sql --insecure -e "SET CLUSTER SETTING sql.defaults.intervalstyle.enabled = true;"
 }
 
+gem env
+
 # Install ruby dependencies.
-gem install bundler:2.1.4
+gem install bundler:2.4.9 rake:13.0.6
+
 bundle install
 
 run_cockroach
@@ -73,11 +76,6 @@ else
     HAS_FAILED=0
 fi
 
-# Attempt a clean shutdown for good measure. We'll force-kill in the
-# exit trap if this script fails.
-cockroach quit --insecure
-trap - EXIT
-
 if [ $HAS_FAILED -eq 1 ]; then
   exit 1
 fi

data/docker.sh

@@ -4,7 +4,7 @@
 
 set -euox pipefail
 
-DOCKER_IMAGE_TAG=cockroachdb/activerecord_test_container:20210914
+DOCKER_IMAGE_TAG=cockroachdb/activerecord_test_container:master
 
 # Absolute path to this repository.
 repo_root=$(cd "$(dirname "${0}")" && pwd)

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

@@ -12,7 +12,8 @@ module ActiveRecord
           {
             read_committed:   "READ COMMITTED",
             repeatable_read:  "REPEATABLE READ",
-            serializable:     "SERIALIZABLE"
+            serializable:     "SERIALIZABLE",
+            read_uncommitted: "READ UNCOMMITTED"
           }
         end
 

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module CockroachDB
+      module OID
+        module DateTime
+          protected
+
+          # override
+          # Uses CockroachDBAdapter instead of PostgreSQLAdapter
+          def real_type_unless_aliased(real_type)
+            ActiveRecord::ConnectionAdapters::CockroachDBAdapter.datetime_type == real_type ? :datetime : real_type
+          end
+        end
+
+        PostgreSQL::OID::DateTime.prepend(DateTime)
+      end
+    end
+  end
+end

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

@@ -2,8 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module CockroachDB
       module Quoting
-        private
-
         # CockroachDB does not allow inserting integer values into string
         # columns, but ActiveRecord expects this to work. CockroachDB will
         # however allow inserting string values into integer columns. It will
@@ -19,7 +17,7 @@ module ActiveRecord
         # (https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry#Well-known_binary)
         # but when creating objects, using RGeo features is more convenient than
         # converting to WKB, so this does it automatically.
-        def _quote(value)
+        def quote(value)
           if value.is_a?(Numeric)
             "'#{quote_string(value.to_s)}'"
           elsif RGeo::Feature::Geometry.check_type(value)

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

@@ -20,17 +20,31 @@ module ActiveRecord
 
           yield
 
-          foreign_keys.each do |foreign_key|
-            begin
-              add_foreign_key(foreign_key.from_table, foreign_key.to_table, **foreign_key.options)
-            rescue ActiveRecord::StatementInvalid => error
-              if error.cause.class == PG::DuplicateObject
-                # This error is safe to ignore because the yielded caller
-                # already re-added the foreign key constraint.
-              else
-                raise error
+          # Prefixes and suffixes are added in add_foreign_key
+          # in AR7+ so we need to temporarily disable them here,
+          # otherwise prefixes/suffixes will be erroneously added.
+          old_prefix = ActiveRecord::Base.table_name_prefix
+          old_suffix = ActiveRecord::Base.table_name_suffix
+
+          ActiveRecord::Base.table_name_prefix = ""
+          ActiveRecord::Base.table_name_suffix = ""
+
+          begin
+            foreign_keys.each do |foreign_key|
+              begin
+                add_foreign_key(foreign_key.from_table, foreign_key.to_table, **foreign_key.options)
+              rescue ActiveRecord::StatementInvalid => error
+                if error.cause.class == PG::DuplicateObject
+                  # This error is safe to ignore because the yielded caller
+                  # already re-added the foreign key constraint.
+                else
+                  raise error
+                end
               end
             end
+          ensure
+            ActiveRecord::Base.table_name_prefix = old_prefix
+            ActiveRecord::Base.table_name_suffix = old_suffix
           end
         end
       end

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

@@ -10,21 +10,44 @@ module ActiveRecord
         # exceeded.
         def within_new_transaction(isolation: nil, joinable: true, attempts: 0)
           super(isolation: isolation, joinable: joinable)
+        rescue ActiveRecord::ConnectionNotEstablished => error
+          raise unless retryable? error
+          raise if attempts >= @connection.max_transaction_retries
+
+          sleep_rand_seconds(attempts)
+
+          unless @connection.active?
+            warn "connection isn't active, reconnecting"
+            @connection.reconnect!
+          end
+
+          within_new_transaction(isolation: isolation, joinable: joinable, attempts: attempts + 1) { yield }
         rescue ActiveRecord::StatementInvalid => error
           raise unless retryable? error
           raise if attempts >= @connection.max_transaction_retries
 
-          attempts += 1
-          sleep_seconds = (2 ** attempts + rand) / 10
-          sleep(sleep_seconds)
-          within_new_transaction(isolation: isolation, joinable: joinable, attempts: attempts) { yield }
+          sleep_rand_seconds(attempts)
+
+          within_new_transaction(isolation: isolation, joinable: joinable, attempts: attempts + 1) { yield }
         end
 
         def retryable?(error)
+          return true if serialization_error?(error)
           return true if error.is_a? ActiveRecord::SerializationFailure
           return retryable? error.cause if error.cause
           false
         end
+
+        def serialization_error?(error)
+          errors = [error]
+          errors << error.cause if error.cause
+          errors.any? {|e| e.is_a? PG::TRSerializationFailure }
+        end
+
+        def sleep_rand_seconds(attempts)
+          sleep_seconds = (2 ** attempts + rand) / 10
+          sleep(sleep_seconds)
+        end
       end
     end
 

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -18,7 +18,9 @@ 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"
 require "active_record/connection_adapters/cockroachdb/arel_tosql"
+require_relative "../migration/cockroachdb/compatibility"
 require_relative "../../version"
 
 # Run to ignore spatial tables that will break schemna dumper.
@@ -215,6 +217,10 @@ module ActiveRecord
         false
       end
 
+      def supports_deferrable_constraints?
+        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
@@ -293,8 +299,20 @@ module ActiveRecord
         false
       end
 
-      private
+      # override
+      # The PostgreSQLAdapter uses syntax for an anonymous function
+      # (DO $$) that CockroachDB does not support.
+      #
+      # Given a name and an array of values, creates an enum type.
+      def create_enum(name, values)
+        sql_values = values.map { |s| "'#{s}'" }.join(", ")
+        query = <<~SQL
+          CREATE TYPE IF NOT EXISTS \"#{name}\" AS ENUM (#{sql_values});
+        SQL
+        exec_query(query)
+      end
 
+      class << self
         def initialize_type_map(m = type_map)
           %w(
             geography
@@ -341,10 +359,13 @@ module ActiveRecord
               # lookups on PG
               Type::DecimalWithoutScale.new(precision: precision)
             else
-              OID::Decimal.new(precision: precision, scale: scale)
+              ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Decimal.new(precision: precision, scale: scale)
             end
           end
         end
+      end
+
+      private
 
         # Configures the encoding, verbosity, schema search path, and time zone of the connection.
         # This is called by #connect and should not be called manually.
@@ -366,7 +387,7 @@ module ActiveRecord
           # If using Active Record's time zone support configure the connection to return
           # TIMESTAMP WITH ZONE types in UTC.
           unless variables["timezone"]
-            if ActiveRecord::Base.default_timezone == :utc
+            if ActiveRecord.default_timezone == :utc
               variables["timezone"] = "UTC"
             elsif @local_tz
               variables["timezone"] = @local_tz

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

@@ -0,0 +1,28 @@
+require "active_record/migration"
+require "active_record/migration/compatibility"
+
+module ActiveRecord
+  class Migration
+    module CockroachDB
+      module Compatibility
+        module V7_0Patch
+          # Override. Use "CockroachDB" instead of "PostgreSQL"
+          def compatible_timestamp_type(type, connection)
+            if connection.adapter_name == "CockroachDB"
+              # For Rails <= 6.1, :datetime was aliased to :timestamp
+              # See: https://github.com/rails/rails/blob/v6.1.3.2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L108
+              # From Rails 7 onwards, you can define what :datetime resolves to (the default is still :timestamp)
+              # See `ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.datetime_type`
+              type.to_sym == :datetime ? :timestamp : type
+            else
+              type
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+prepend_mod = ActiveRecord::Migration::CockroachDB::Compatibility::V7_0Patch
+ActiveRecord::Migration::Compatibility::V6_1::PostgreSQLCompat.singleton_class.prepend(prepend_mod)

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.10
+  version: 7.0.1
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 description: Allows the use of CockroachDB as a backend for ActiveRecord and Rails
   apps.
 email:
@@ -60,8 +74,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/docker.yml"
 - ".gitignore"
 - ".gitmodules"
+- ".ruby-version"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -82,6 +98,7 @@ files:
 - lib/active_record/connection_adapters/cockroachdb/column_methods.rb
 - lib/active_record/connection_adapters/cockroachdb/database_statements.rb
 - lib/active_record/connection_adapters/cockroachdb/database_tasks.rb
+- lib/active_record/connection_adapters/cockroachdb/oid/date_time.rb
 - lib/active_record/connection_adapters/cockroachdb/oid/interval.rb
 - lib/active_record/connection_adapters/cockroachdb/oid/spatial.rb
 - lib/active_record/connection_adapters/cockroachdb/oid/type_map_initializer.rb
@@ -96,6 +113,7 @@ files:
 - lib/active_record/connection_adapters/cockroachdb/transaction_manager.rb
 - lib/active_record/connection_adapters/cockroachdb/type.rb
 - lib/active_record/connection_adapters/cockroachdb_adapter.rb
+- lib/active_record/migration/cockroachdb/compatibility.rb
 - lib/activerecord-cockroachdb-adapter.rb
 - lib/version.rb
 homepage: https://github.com/cockroachdb/activerecord-cockroachdb-adapter
@@ -118,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: CockroachDB adapter for ActiveRecord.