sequel-activerecord_connection 1.2.10 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c5925926ff3924bcef9f86b9450449c801e260196b9d25b85fefa2ce569239
-  data.tar.gz: c7b26f34a3b40ea1691f82e28aa1dd83cf598593c2dd96aa4f7ba3f450cd97fd
+  metadata.gz: 57e9f74b5adc96221191cb92f1be8b2e2614d2fce446bb43d50fc603e755c3d7
+  data.tar.gz: efdb083362ed82dec77628b75161aa913e2ef805a8b3d8bec621aaa2e1a693f7
 SHA512:
-  metadata.gz: 29c0ff34e41b468d04b24f0ab17dcea10ff63b562873a63669f137b24eb31c3b78869d35154879719c1bc270bc161893250c29ab22dd89fb45ddd4abc0d0678f
-  data.tar.gz: 4de28a717d23a9879420c716c81ff7609768f76d224394c254f91b76338f6b7b38399584a63152745e0b4efc165a34e223ca5f113fcc54cdbb65abf92ca9448d
+  metadata.gz: 0bf43086bf259333fb61dde411660ea2ba65bb03c2d98e123d63283dff257b970426ffb8494d5cc5b1f1d9c4cc73f6c65140c66e7346e8346d82adb7b20598c2
+  data.tar.gz: 83b368227d5620985878b5bdb1bc6a31ceb6a9b3f2c0b87b206126e5dcdbb05bb8a7e6917457f7bb04b37a22abac3c2ba9b6e8468bb4cf3eb27d4011ab17aa3e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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)
+
 ## 1.2.10 (2022-12-13)
 
 * Fix incorrect PG type mapping when using prepared statements in Sequel (@janko)
@@ -12,7 +20,7 @@
 
 ## 1.2.7 (2022-01-20)
 
-* Require Sequel 3.38+ (@janko)
+* Require Sequel 5.38+ (@janko)
 
 ## 1.2.6 (2021-12-26)
 

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/mysql2.rb

@@ -27,6 +27,10 @@ module Sequel
           conn.query_options.replace(conn.remove_instance_variable(:@sequel_default_query_options))
         end
       end
+
+      def activerecord_connection_class
+        ::Mysql2::Client
+      end
     end
   end
 end

data/lib/sequel/extensions/activerecord_connection/postgres.rb

@@ -39,6 +39,10 @@ module Sequel
         end
       end
 
+      def activerecord_connection_class
+        ::PG::Connection
+      end
+
       # Copy-pasted from Sequel::Postgres::Adapter.
       module ConnectionMethods
         # The underlying exception classes to reraise as disconnect errors

data/lib/sequel/extensions/activerecord_connection/sqlite.rb

@@ -28,6 +28,10 @@ module Sequel
           end
         end
       end
+
+      def activerecord_connection_class
+        ::SQLite3::Database
+      end
     end
   end
 end

data/lib/sequel/extensions/activerecord_connection/tinytds.rb

@@ -14,6 +14,12 @@ module Sequel
           end
         end
       end
+
+      private
+
+      def activerecord_connection_class
+        ::TinyTds::Client
+      end
     end
   end
 end

data/lib/sequel/extensions/activerecord_connection.rb

@@ -35,7 +35,13 @@ module Sequel
     # Avoid calling Sequel's connection pool, instead use Active Record's.
     def synchronize(*)
       activerecord_lock do
-        yield activerecord_connection.raw_connection
+        conn = activerecord_connection.raw_connection
+
+        if activerecord_connection_class && !conn.is_a?(activerecord_connection_class)
+          fail Error, "expected Active Record connection to be a #{activerecord_connection_class}, got #{conn.class}"
+        end
+
+        yield conn
       end
     end
 
@@ -51,6 +57,13 @@ module Sequel
       @timezone || activerecord_timezone
     end
 
+    # Clear Active Record's query cache after potential data modifications.
+    def execute(*)
+      super
+    ensure
+      clear_activerecord_query_cache
+    end
+
     private
 
     # Synchronizes transaction state with ActiveRecord. Sequel uses this
@@ -130,6 +143,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.
@@ -151,6 +174,10 @@ module Sequel
       activerecord_model.connection
     end
 
+    def activerecord_connection_class
+      # defines in adapter modules
+    end
+
     def activerecord_log(sql, &block)
       ActiveSupport::Notifications.instrument(
         "sql.active_record",

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.2.10"
+  spec.version       = "1.3.0"
   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.10
+  version: 1.3.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 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.3.3
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Allows Sequel to use ActiveRecord connection for database interaction.