activerecord-cockroachdb-adapter 7.2.3 → 7.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 986b2d4c2759aab6b8bcae1ccaf58421331bb9049721394cd31e232614b05a22
-  data.tar.gz: 44f28a2f9fffa398143219695ed56f8f9b25fff97624e4ea390dbe8bcae987bb
+  metadata.gz: c264b125195bc158e58aa652d8ef439fbdc0143906e89b36f4dde335b0d01a62
+  data.tar.gz: 30edfe2dcfd8c22c9e85e90a4b473321537f3f2c7360aa532e0a4828e5c51697
 SHA512:
-  metadata.gz: e45d26b18980f9af81f1170cfea00eb94a95853597472b4261b3ff959732e8cc257727d1cbfe1948689a54fc536db1b79f28f6c056bfaade1af681407e4096bf
-  data.tar.gz: 8e5a41b5197eda1143bb13cc93408eaadb707eb187ff4140894efba8b545c7a5a8c42ba857c5f42c572604ccb42dc1334fcf97f1a5bd1f543ac0f1941565be5e
+  metadata.gz: c16131d979e0786fe578d33f3f39e402c8dbe86c7b8c2d9a505ed6e54cdfc0de47b7a36913ae6fb5d626bd834083ce9f12a03c4656bf51e6e7088f63924944ec
+  data.tar.gz: ad0ebb869bd80919de447aab0ca459f7a40f87ca0a682f2939b4f17cbc98572fe2b542e214391acb2e592bcb1fe814cdd06e22678766d645a84585402072ae76

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.2.4 - 2026-08-19
+
+- Detect cached plan failures by error message instead of source function, so recovery keeps working after CockroachDB moved where the error is raised ([#403](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/403))
+
 ## 7.2.3 - 2026-01-30
 
 - Disallow usage of ROLLBACK AND CHAIN syntax, which is not yet supported in CockroachDB ([#397](https://github.com/cockroachdb/activerecord-cockroachdb-adapter/pull/397))

data/lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -449,24 +449,24 @@ module ActiveRecord
         end
 
         # override
-        # This method is used to determine if a
-        # FEATURE_NOT_SUPPORTED error from the PG gem should
-        # be an ActiveRecord::PreparedStatementCacheExpired
-        # error.
+        # Classifies a FEATURE_NOT_SUPPORTED error from the PG gem as an
+        # ActiveRecord::PreparedStatementCacheExpired.
         #
-        # ActiveRecord handles this by checking that the sql state matches the
-        # FEATURE_NOT_SUPPORTED code and that the source function
-        # is "RevalidateCachedQuery" since that is the only function
-        # in postgres that will create this error.
-        #
-        # That method will not work for CockroachDB because the error
-        # originates from the "runExecBuilder" function, so we need
-        # to modify the original to match the CockroachDB behavior.
+        # Upstream matches PG_DIAG_SOURCE_FUNCTION == "RevalidateCachedQuery",
+        # the one PostgreSQL C function that raises this error. CockroachDB's
+        # raising function is an internal detail that has already moved
+        # (runExecBuilder before cockroachdb/cockroach#164406, execBind after),
+        # so match the message instead. The message is not formally guaranteed,
+        # but it has been unchanged in PostgreSQL since 8.3 and drivers such as
+        # pgx assert the exact string. Upstream avoids message matching because
+        # PostgreSQL localizes messages via lc_messages (rails/rails@d507ae2a74);
+        # CockroachDB does not localize, so that concern does not apply.
+        CACHED_PLAN_HEURISTIC = "cached plan must not change result type"
         def is_cached_plan_failure?(e)
           pgerror = e.cause
 
           pgerror.result.result_error_field(PG::PG_DIAG_SQLSTATE) == FEATURE_NOT_SUPPORTED &&
-            pgerror.result.result_error_field(PG::PG_DIAG_SOURCE_FUNCTION) == "runExecBuilder"
+            pgerror.result.result_error_field(PG::PG_DIAG_MESSAGE_PRIMARY).include?(CACHED_PLAN_HEURISTIC)
         rescue
           false
         end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 7.2.3
+  version: 7.2.4
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 2026-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord