arsi 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4568758138c9d89d766860d327ee3233771f8a0e25924288b57513088a4894f8
-  data.tar.gz: 06c17d87d50c76db362a083a358c731828359ca0195db29062b1a1e8346feabf
+  metadata.gz: b528e9d79cdc0d21f70a93d39d631f2ad72f239eda03ea6d40a249ba85f00d81
+  data.tar.gz: 9fa5461a0c90bc0efbc3a85d2adaf913ca147425b83e378ed0c34c7ecf829da5
 SHA512:
-  metadata.gz: 38b1cdb07c23ac73a838702f89ecb5239e341cc9df2220def0a414dea33c946fe258606c0b0ef88dce980675ee87ba75407c115456a91b370f50312fc0638247
-  data.tar.gz: 4c603a0b1fdb9fca7ee7c9dd02869f9d29df4e127b7ba65a939ec4f0c42087275aad6be0b16189de22034e56fa679947d4427ead5ff80ff94ca39f528e556c0a
+  metadata.gz: f5646db280bf628a6e75a1dffa57794a64a2ffbd2ff18942b04aec3fa35eaa9c7b8ccf4040078295404542d5c19fc391d01bc4ba1ab7af058c85cb3cddf75bcb
+  data.tar.gz: be068e843094617e04279a4917e802a047f88f6ada372604a1e5c2dee1d7c7b790c65a71662c56ea817aeaf74602234182254908615208c49de008743de4b237

data/lib/arsi/persistence.rb

@@ -0,0 +1,26 @@
+module Arsi
+  module Persistence
+    def self.prepended(klass)
+      klass.singleton_class.prepend(ClassMethods)
+    end
+
+    module ClassMethods
+      def _update_record(*)
+        with_relation_in_connection { super }
+      end
+
+      def _delete_record(*)
+        with_relation_in_connection { super }
+      end
+
+      private
+
+      def with_relation_in_connection
+        connection.arsi_relation = self.unscoped
+        yield
+      ensure
+        connection.arsi_relation = nil
+      end
+    end
+  end
+end

data/lib/arsi/relation.rb

@@ -18,10 +18,6 @@ module Arsi
       !arsi_scopeable?
     end
 
-    def _update_record(*)
-      with_relation_in_connection { super }
-    end
-
     def delete_all(*)
       with_relation_in_connection { super }
     end

data/lib/arsi/version.rb

@@ -1,3 +1,3 @@
 module Arsi
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/arsi.rb

@@ -1,5 +1,6 @@
 require 'arsi/arel_tree_manager'
 require 'arsi/mysql2_adapter'
+require 'arsi/persistence'
 require 'arsi/relation'
 require 'active_record'
 require 'active_record/connection_adapters/mysql2_adapter'
@@ -9,6 +10,7 @@ module Arsi
   Arel::UpdateManager.include(ArelTreeManager)
   Arel::DeleteManager.include(ArelTreeManager)
   ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(Mysql2Adapter)
+  ActiveRecord::Base.prepend(Persistence)
   ActiveRecord::Relation.prepend(Relation)
   ActiveRecord::Querying.delegate(:without_arsi, :to => :relation)
 
@@ -53,10 +55,11 @@ module Arsi
     private
 
     def arel_where_sql(arel, relation)
-      return arel.where_sql if relation.nil?
-      return arel.where_sql unless relation.model.respond_to?(:arel_engine)
-
-      arel.where_sql(relation.model.arel_engine)
+      if relation.nil?
+        arel.where_sql
+      else
+        arel.where_sql(relation.model)
+      end
     end
 
     def sql_check!(sql, relation)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arsi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Christopher Kintner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -125,13 +125,14 @@ files:
 - lib/arsi.rb
 - lib/arsi/arel_tree_manager.rb
 - lib/arsi/mysql2_adapter.rb
+- lib/arsi/persistence.rb
 - lib/arsi/relation.rb
 - lib/arsi/version.rb
 homepage: https://github.com/zendesk/arsi
 licenses:
 - Apache License Version 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,15 +140,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Inspector
 test_files: []