sequel-activerecord_connection 1.2.11 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0b564099dd7cf0627c98960d7ca34a0fb1682aaa1f5262ee03de9a9bf2ad8a
-  data.tar.gz: 90b84910bae08b57fcc4e3f29deafe07e1e5fb620ae662960c0058a462bc81b2
+  metadata.gz: 0e7023579a13396cf034b357786ebf56c98c15a09693ffe97900c86b221cc596
+  data.tar.gz: ff4b9033f260499e70a7f82ee901a77a8e370b230e968072c04d9ae5d4226029
 SHA512:
-  metadata.gz: 58fd8e6e50e2dc25dba484c1deee60c1f20681761431c4654a3da092572f2cbfb768eb992a7d7e7eb6f03a77691289e3dd5366796c03ecfdefdbf88412bbfa29
-  data.tar.gz: c92338695de7971f16dd4adf3b518bb00f294a033df519fb1b7077c05a3d080cda443c3ac6d245214d2a07d53c7a00c12dbb914de4cda6e8bb74547c6da6541d
+  metadata.gz: ac0955585457b396ffe074ddb6c040adba15b42052d1c1649635c85223b7cee86e11986b639cbe2a868048ab6926d410f5564210ef745101aa880d591242c57d
+  data.tar.gz: 459fd7c8b13036b93afe8dfd9a63af1137997ad04fd8e340a9a218c31196ff319dc29861647bfffd9e9a338a21a3cacb88439d04e45fff09f5fa81765167025f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.3.1 (2023-04-22)
+
+* Fix Active Record's query cache not being cleared in SQLite adapter (@janko)
+
+## 1.3.0 (2023-04-22)
+
+* Clear Active Record query cache after Sequel executes SQL statements (@janko)
+
 ## 1.2.11 (2023-01-09)
 
 * Raise explicit exception in case of mismatch between Active Record and Sequel adapter (@janko)

data/README.md

@@ -239,13 +239,25 @@ sensitive data from being stored in the logs, you can use the
 logged SQL queries:
 
 ```rb
-DB = Sequel.postgres(extensions: :activerecord_connection)
-DB.extension :sql_log_normalizer
+Sequel.postgres(extensions: [:activerecord_connection, :sql_log_normalizer])
 ```
 ```sql
 SELECT accounts.* FROM accounts WHERE accounts.email = ? LIMIT ?
 ```
 
+Note that the `sql_log_normalizer` extension opens a database connection while
+it's being loaded. If you're setting up Sequel in a Rails initializer, you'll
+probably want to handle the database not existing, so that commands such as
+`rails db:create` continue to work.
+
+```rb
+DB = Sequel.postgres(extensions: :activerecord_connection)
+begin
+  DB.extension :sql_log_normalizer
+rescue ActiveRecord::NoDatabaseError
+end
+```
+
 ## Tests
 
 You'll first want to run the rake tasks for setting up databases and users:

data/lib/sequel/extensions/activerecord_connection.rb

@@ -57,6 +57,17 @@ module Sequel
       @timezone || activerecord_timezone
     end
 
+    # Clear Active Record's query cache after potential data modifications.
+    %i[execute_ddl execute_dui execute_insert execute].each do |execute_method|
+      define_method(execute_method) do |*args, &block|
+        begin
+          super(*args, &block)
+        ensure
+          clear_activerecord_query_cache
+        end
+      end
+    end
+
     private
 
     # Synchronizes transaction state with ActiveRecord. Sequel uses this
@@ -136,6 +147,16 @@ module Sequel
       super
     end
 
+    if ActiveRecord.version >= Gem::Version.new("7.0")
+      def clear_activerecord_query_cache
+        activerecord_model.clear_query_caches_for_current_thread
+      end
+    else
+      def clear_activerecord_query_cache
+        activerecord_connection.clear_query_cache
+      end
+    end
+
     # Active Record doesn't guarantee that a single connection can only be used
     # by one thread at a time, so we need to use locking, which is what Active
     # Record does internally as well.

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.2.11"
+  spec.version       = "1.3.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.3.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.