activerecord-cockroachdb-adapter 8.0.1 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9721532ff04318993f0835604dff8899289ee81e84e0f6daff67ad8a0024b608
-  data.tar.gz: 82db81fab9b8358ea7953bfd7a9a3863794ea0946b56dfd5b57aefe7f2951eba
+  metadata.gz: bb3247022d4dd7a36aaf82f09bfe1502c9106f570b14e6d09c9cd1076c2b8dc6
+  data.tar.gz: 0a8deb6f3b4741296899a08c1fc29df3afd0dcaf946538600e4e39e7f5e98170
 SHA512:
-  metadata.gz: 6089da8ff8fcbb51435f6c408c663fe31d76c2652e7053b1f074ca36769ef88e99356a25b3530eb36dc2dbbc93e3a1db14d52ef76323abda301a093ed0217200
-  data.tar.gz: c236373fdc39156b05aa546b596eda2aba501de27f9a486947fc4ec25a8f871210e436675e191d0b369ad1d159dd851544d0df538725f1bef18b3fc2efb1354f
+  metadata.gz: 48c6242571df5e27fa2bc30f5a699c64bbe4d3f37c47d3ab3deedbc39050470636a664df51c1c47b74e970b6950b995746ee715e44818c91bcd1d832b400bb8f
+  data.tar.gz: 82169f6e8946a5c6ecbd82001b7fa2e163bc11f739946c184ca4aedbdb95a700e5522fa304ed302050d70e26fb61a65162cfdc8f4be934f96c31c386b8bca5d5

data/.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         # https://www.cockroachlabs.com/docs/releases/release-support-policy
-        crdb: [v23.2, v24.1, v24.3]
+        crdb: [v24.1, v24.3, v25.1, v25.2]
         ruby: ["3.4"]
     name: Test (crdb=${{ matrix.crdb }} ruby=${{ matrix.ruby }})
     steps:
@@ -53,6 +53,8 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+      - name: Show Rails version
+        run: bundle info rails
       - name: Install and Start Cockroachdb
         run: |
           # Download CockroachDB

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Ongoing
 
+## 8.0.3 - 2025-08-19
+
+- Fixed the handling of column comments that end in a single quote ([#382](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/382))
+
+## 8.0.2 - 2025-07-14
+
+- Fixed the `db:migrate` command by removing usage of `execute_and_clear` function ([#377](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/377))
+
 ## 8.0.1 - 2025-03-04
 
 - Fixed retry logic after transaction rollback ([#364](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/364))

data/Gemfile

@@ -60,6 +60,7 @@ group :development, :test do
 
   # Gems used for tests meta-programming.
   gem "parser"
+  gem "prism" # Parser is being softly deprecated, but Prism doesn't have rewriting capabilities
 
   # Gems used by the ActiveRecord test suite
   gem "bcrypt", "~> 3.1"

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -427,7 +427,7 @@ module ActiveRecord
           fields.map do |field|
             dtype = field[f_type]
             field[f_type] = crdb_fields[field[f_attname]][2].downcase if re.match(dtype)
-            field[f_comment] = crdb_fields[field[f_attname]][1]&.gsub!(/^\'|\'?$/, '')
+            field[f_comment] = crdb_fields[field[f_attname]][1]
             field[f_is_hidden] = true if crdb_fields[field[f_attname]][3]
             field
           end
@@ -455,9 +455,8 @@ module ActiveRecord
             WHERE c.table_name = #{quote(table)}#{with_schema}
           SQL
 
-          fields.reduce({}) do |a, e|
-            a[e[0]] = e
-            a
+          fields.to_h do |field|
+            [field.first, field]
           end
         end
 
@@ -492,9 +491,8 @@ module ActiveRecord
           if @config[:use_follower_reads_for_type_introspection]
             initializer = OID::TypeMapInitializer.new(type_map)
             load_types_queries_with_aost(initializer, oids) do |query|
-              execute_and_clear(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false) do |records|
-                initializer.run(records)
-              end
+              records = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false)
+              initializer.run(records)
             end
           else
             super
@@ -550,9 +548,8 @@ 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
+            result = internal_execute(query, "SCHEMA", [], allow_retry: true, materialize_transactions: false)
+            coders = result.filter_map { |row| construct_coder(row, coders_by_name[row["typname"]]) }
 
             map = PG::TypeMapByOid.new
             coders.each { |coder| map.add_coder(coder) }

data/lib/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module ActiveRecord
-  COCKROACH_DB_ADAPTER_VERSION = "8.0.1"
+  COCKROACH_DB_ADAPTER_VERSION = "8.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.3
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord