activerecord-cockroachdb-adapter 6.1.4 → 6.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee61867492cc8b0c28f58b9090625a08914e610e6a1732924a2b4d925a01a714
-  data.tar.gz: d7ae4281ca3738f92e84df29243c687693cf8aed64ba006d9c44541c25ba2029
+  metadata.gz: 95b9157a969cd938c7500ed5a755120ec9f9bdce6e5e11316d32e2e434e8d7b2
+  data.tar.gz: 96f79790d7f0fbbb95b32e3e07425fe8df2d10830165e31302f0d9fa8f27405a
 SHA512:
-  metadata.gz: c61ca3b032274dc8cc5063e55465fdc2b418bbda7c6d8a4093405d61c5c2b49758faaf77f95a76eb0c46101e3ec0a4f9c1442744abe49bcc747a0b86de64bec9
-  data.tar.gz: f91ea52d72dcef0c50e87186b12f10c7118882e48e10ef667c64e59da159493ea8dd23b5bbb4256c9222d703afaf89d7554831d2ef523096151af9fdf9faaf9f
+  metadata.gz: ed654032304e706dcab7ab22514b5e1e93facfa946686a9455676fa220c5aff0859044645b778d0ef63f8482809a21440846d733f263ec007c548a4bba18c891
+  data.tar.gz: 8a1d4ae16ac33747a80b2a1af1d04095358265d7949e43b66ba3e77aa02d310c9ebc32891d315ce9351197223e6f04e238cb1bd1eb57c8ffef2ecf94a120ed31

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 6.1.7 - 2022-03-01
+
+- Fix query to get the CockroachDB version so it does not require any privileges.
+
+## 6.1.6 - 2022-02-25
+
+- Fix mixed versions of CockroachDB v21.1 and v21.2 not working.
+
+## 6.1.5 - 2022-02-08
+
+- Support `atttypmod` being sent for DECIMAL types.
+  This is needed for CockroachDB v22.1.
+
 ## 6.1.4 - 2021-12-09
 
 - Add support for CockroachDB v21.2.

data/build/teamcity-test.sh

@@ -3,7 +3,7 @@
 set -euox pipefail
 
 # Download CockroachDB
-VERSION=v21.2.0
+VERSION=v21.2.5
 wget -qO- https://binaries.cockroachdb.com/cockroach-$VERSION.linux-amd64.tgz | tar  xvz
 readonly COCKROACH=./cockroach-$VERSION.linux-amd64/cockroach
 
@@ -35,8 +35,28 @@ 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_temporary_tables.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;"
+  cockroach sql --insecure -e "ALTER RANGE meta CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;"
+  cockroach sql --insecure -e "ALTER RANGE system CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;"
+  cockroach sql --insecure -e "ALTER RANGE liveness CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;"
+
+  cockroach sql --insecure -e "SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms'"
+  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;"
 }
 
 # Install ruby dependencies.

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -228,27 +228,42 @@ module ActiveRecord
       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? "v1."
-          version_num = 1
-        elsif crdb_version_string.include? "v2."
-          version_num 2
-        elsif crdb_version_string.include? "v19.1."
-          version_num = 1910
-        elsif crdb_version_string.include? "v19.2."
-          version_num = 1920
-        elsif crdb_version_string.include? "v20.1."
-          version_num = 2010
-        elsif crdb_version_string.include? "v20.2."
-          version_num = 2020
-        elsif crdb_version_string.include? "v21.1."
-          version_num = 2110
-        elsif crdb_version_string.include? "v21.2.0"
-          version_num = 2120
+        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
         else
-          version_num = 2121
+          # This branch can be removed once the dialect stops supporting v21.2
+          # and earlier.
+          if crdb_version_string.include? "v1."
+            version_num = 1
+          elsif crdb_version_string.include? "v2."
+            version_num 2
+          elsif crdb_version_string.include? "v19.1."
+            version_num = 1910
+          elsif crdb_version_string.include? "v19.2."
+            version_num = 1920
+          elsif crdb_version_string.include? "v20.1."
+            version_num = 2010
+          elsif crdb_version_string.include? "v20.2."
+            version_num = 2020
+          elsif crdb_version_string.include? "v21.1."
+            version_num = 2110
+          else
+            version_num = 2120
+          end
         end
-        @crdb_version = version_num
+        @crdb_version = version_num.to_i
 
         # NOTE: this is normally in configure_connection, but that is run
         # before crdb_version is determined. Once all supported versions
@@ -256,8 +271,14 @@ module ActiveRecord
         # back.
         # Set interval output format to ISO 8601 for ease of parsing by ActiveSupport::Duration.parse
         if @crdb_version >= 2120
-          execute("SET intervalstyle_enabled = true", "SCHEMA")
-          execute("SET intervalstyle = iso_8601", "SCHEMA")
+          begin
+            execute("SET intervalstyle_enabled = true", "SCHEMA")
+            execute("SET intervalstyle = iso_8601", "SCHEMA")
+          rescue
+            # Ignore any error. This can happen with a cluster that has
+            # not yet finalized the v21.2 upgrade. v21.2 does not have
+            # a way to tell if the upgrade was finalized (see comment above).
+          end
         end
       end
 
@@ -297,9 +318,19 @@ 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.
+            #
+            # When dealing with decimal columns:
+            #
+            # places after decimal  = fmod - 4 & 0xffff
+            # places before decimal = (fmod - 4) >> 16 & 0xffff
+            #
+            # For older versions of CockroachDB (<v22.1), fmod is -1 for 0 width.
             # If fmod is -1, that means that precision is defined but not
             # scale, or neither is defined.
-            if fmod && fmod == -1 && !precision.nil?
+            if fmod && ((fmod == -1 && !precision.nil?) || (fmod - 4 & 0xffff).zero?)
               # Below comment is from ActiveRecord
               # FIXME: Remove this class, and the second argument to
               # lookups on PG

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.1.7
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord