activerecord-cockroachdb-adapter 6.1.2 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d0c9c46ba26129c6660d4c7dcc7fab97e62e6544cf97be3de59876df04b8b49
-  data.tar.gz: 35952dc2b491d58a1550a8466a0010ce1530465f7e5c17d3cb1863de9d17c304
+  metadata.gz: c2f121de56f7c6e8cf67c486533873cf2f081ec2dbe32a6d395849ecd9f7f958
+  data.tar.gz: 698808276bece741fc6ec06a69e871ca482e6e69ff3b9e5e95b278619bf4ee02
 SHA512:
-  metadata.gz: d1d62e4dc3ef136ebb472b4439f0a500cd64e4c16a1d7f6f1f75d7426ddfd85dc871eb26889b3d617dc80816c3d47533c6d46b9dce6fbc42df8049d76f680cf8
-  data.tar.gz: 02b1e634681a6e2d25d88d2d78dd0c658bf4125decbce637fa5fa672e3651c099106ee79de86ffa2037ceb3f6fc13e80e8e870b6154e4dbd96f5405b3829003d
+  metadata.gz: b2e9255a98a5114f7fd644baf0c2bd3e509f78b2fd73f4c5a85748b9e7ae8a1f212721ffcdf7e04f5bcb841bf752740ed4e0d2c97756f46b65677419fab89e10
+  data.tar.gz: b7680180bc3c35f350f92912f447a988582b54f6f90f18414f3b7a730b7b57bfa49c6bfbf2c7668e58a1974f140b02979c9d5cbbae5fa81d0871d39c123b6b39

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.1.3 - 2021-07-28
+
+- Santitize the input to the telemetry query that is issued on startup.
+
 ## 6.1.2 - 2021-05-20
 
 - Fix a bug where starting the driver can result in a ConnectionNotEstablished error.

data/activerecord-cockroachdb-adapter.gemspec

@@ -1,10 +1,14 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require './lib/version.rb'
+version = ActiveRecord::COCKROACH_DB_ADAPTER_VERSION
+
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-cockroachdb-adapter"
-  spec.version       = "6.1.2"
+  spec.version       = version
   spec.licenses      = ["Apache-2.0"]
   spec.authors       = ["Cockroach Labs"]
   spec.email         = ["cockroach-db@googlegroups.com"]

data/build/teamcity-test.sh

@@ -3,7 +3,7 @@
 set -euox pipefail
 
 # Download CockroachDB
-VERSION=v20.2.3
+VERSION=v21.1.5
 wget -qO- https://binaries.cockroachdb.com/cockroach-$VERSION.linux-amd64.tgz | tar  xvz
 readonly COCKROACH=./cockroach-$VERSION.linux-amd64/cockroach
 
@@ -36,6 +36,7 @@ run_cockroach() {
   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'"
 }
 
 # Install ruby dependencies.

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -17,6 +17,7 @@ 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/arel_tosql"
+require_relative "../../version"
 
 # Run to ignore spatial tables that will break schemna dumper.
 # Defined in ./setup.rb
@@ -63,13 +64,18 @@ module ActiveRecord
         adapter = pool_config.db_config.configuration_hash[:adapter]
         return if disable_telemetry || adapter != "cockroachdb"
 
-
         begin
           with_connection do |conn|
             if conn.active?
               begin
-                query = "SELECT crdb_internal.increment_feature_counter('ActiveRecord %d.%d')"
-                conn.execute(query % [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR])
+                ar_version = conn.quote("ActiveRecord %d.%d" % [ActiveRecord::VERSION::MAJOR,
+                                                                ActiveRecord::VERSION::MINOR])
+                ar_query = "SELECT crdb_internal.increment_feature_counter(%s)" % ar_version
+                adapter_version = conn.quote("activerecord-cockroachdb-adapter #{ActiveRecord::COCKROACH_DB_ADAPTER_VERSION}")
+                adapter_query = "SELECT crdb_internal.increment_feature_counter(%s)" % adapter_version
+
+                conn.execute(ar_query)
+                conn.execute(adapter_query)
               rescue ActiveRecord::StatementInvalid
                 # The increment_feature_counter built-in is not supported on this
                 # CockroachDB version. Ignore.
@@ -180,12 +186,10 @@ module ActiveRecord
       end
 
       def supports_comments?
-        # See cockroachdb/cockroach#19472.
-        false
+        @crdb_version >= 201
       end
 
       def supports_comments_in_create?
-        # See cockroachdb/cockroach#19472.
         false
       end
 
@@ -235,8 +239,10 @@ module ActiveRecord
           version_num = 192
         elsif crdb_version_string.include? "v20.1."
           version_num = 201
-        else
+        elsif crdb_version_string.include? "v20.2."
           version_num = 202
+        else
+          version_num = 210
         end
         @crdb_version = version_num
       end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.3
 platform: ruby
 authors:
 - Cockroach Labs
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,12 +95,13 @@ files:
 - lib/active_record/connection_adapters/cockroachdb/type.rb
 - lib/active_record/connection_adapters/cockroachdb_adapter.rb
 - lib/activerecord-cockroachdb-adapter.rb
+- lib/version.rb
 homepage: https://github.com/cockroachdb/activerecord-cockroachdb-adapter
 licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: CockroachDB adapter for ActiveRecord.
 test_files: []