activerecord-cockroachdb-adapter 6.1.5 → 6.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f5211d32cfc503198148dab27748e66dc7fd86bd7d1916ed78a59879cc7235
-  data.tar.gz: 69d4191eef0d08f6a472317413eb16abfcdb548e058c6d1074ca34c1a5ad21d4
+  metadata.gz: 55fcba0c750ea29dde5f7a7efcabd35c1c81d1cbabee65ad1aeca9e16ab3e9d6
+  data.tar.gz: 1f3b6c480c3430c53f632d11647afc4d76b8d5a05990e3a7b7f21191f093c746
 SHA512:
-  metadata.gz: a8702aea7fd32df17b58c68d5a29df99c3514784bb876dc1d49c36b98f824f8200a02e74f4f543ec51aaa1d8ff5da14729e155ee5b1223e0944a5768df309244
-  data.tar.gz: 5980c011b221d6b23b96b7f0e4ec0050a991a83235ac975783b67d8543638e1e7b75b47e870ee720c0e4584ec739f312d2946aff8a1580dba46c49a6dab001d9
+  metadata.gz: c29d9e502572a94a2a34ddf43f9cf09aac0aca3c63b6e489844a256cbbce7728ce90280acc8153ab4114dc9721eac37f26752936d5b3418c731fee17a2c1bd98
+  data.tar.gz: 68943312caf4a756081d806e7e6bb29a563d396f435226f2dadf595f2068649d1877f8bd79a88f2b65df9cc57ee998b4e2f7f6a81a7589f1ef03198cd3dc3a1d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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.

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -228,25 +228,25 @@ module ActiveRecord
       def initialize(connection, logger, conn_params, config)
         super(connection, logger, conn_params, config)
 
-        crdb_version_string = query_value("SHOW crdb_version")
-        if crdb_version_string.include? "v1."
+        crdb_version_string = query_value("SHOW CLUSTER SETTING version")
+        if crdb_version_string.start_with? "1."
           version_num = 1
-        elsif crdb_version_string.include? "v2."
-          version_num 2
-        elsif crdb_version_string.include? "v19.1."
+        elsif crdb_version_string.start_with? "2."
+          version_num = 2
+        elsif crdb_version_string.start_with? "19.1"
           version_num = 1910
-        elsif crdb_version_string.include? "v19.2."
+        elsif crdb_version_string.start_with? "19.2"
           version_num = 1920
-        elsif crdb_version_string.include? "v20.1."
+        elsif crdb_version_string.start_with? "20.1"
           version_num = 2010
-        elsif crdb_version_string.include? "v20.2."
+        elsif crdb_version_string.start_with? "20.2"
           version_num = 2020
-        elsif crdb_version_string.include? "v21.1."
+        elsif crdb_version_string.start_with? "21.1"
           version_num = 2110
-        elsif crdb_version_string.include? "v21.2.0"
+        elsif crdb_version_string.start_with? "21.2"
           version_num = 2120
         else
-          version_num = 2121
+          version_num = 2210
         end
         @crdb_version = version_num
 

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.1.6
 platform: ruby
 authors:
 - Cockroach Labs
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,7 +101,7 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: CockroachDB adapter for ActiveRecord.
 test_files: []