arsi 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea5ecd2b64166843083b97523f85c66b2c07246d291b2b44f6d4ed814ec6a42
-  data.tar.gz: 7810f158d8850861dfa9eafa974decf092b537503e82850269abbe67b7f415fc
+  metadata.gz: b528e9d79cdc0d21f70a93d39d631f2ad72f239eda03ea6d40a249ba85f00d81
+  data.tar.gz: 9fa5461a0c90bc0efbc3a85d2adaf913ca147425b83e378ed0c34c7ecf829da5
 SHA512:
-  metadata.gz: f16b52a751b60ed9d6fe42f8dfe1989bc52b6e48e791c541d6dbfab83d969579507a062e82aa01789e992dd883869dc77c112e9e3f6553c7fd80da56a159eeef
-  data.tar.gz: 6b4f455f599f1ce7e68d5518efb85d6b23bfdd800ab58fbab807573a288f78196ba340016926b4aeab2971e66a88cd2f5c79062b9f58907aaf6f956d3371adc6
+  metadata.gz: f5646db280bf628a6e75a1dffa57794a64a2ffbd2ff18942b04aec3fa35eaa9c7b8ccf4040078295404542d5c19fc391d01bc4ba1ab7af058c85cb3cddf75bcb
+  data.tar.gz: be068e843094617e04279a4917e802a047f88f6ada372604a1e5c2dee1d7c7b790c65a71662c56ea817aeaf74602234182254908615208c49de008743de4b237

data/lib/arsi/arel_tree_manager.rb

@@ -2,13 +2,12 @@ require 'arel'
 
 module Arsi
   module ArelTreeManager
-    # This is from Arel::SelectManager which inherits from Arel::TreeManager.
-    # We need where_sql on both Arel::UpdateManager and Arel::DeleteManager so we add it to the parent class.
+    # This is inspired from Arel::SelectManager, a subclass of Arel::TreeManager
+    # just like Arel::UpdateManager and Arel::DeleteManager.
     def where_sql(engine = ::Arel::Table.engine)
-      return if @ctx.wheres.empty?
+      return if @ast.wheres.empty?
 
-      viz = ::Arel::Visitors::WhereSql.new(engine.connection.visitor, engine.connection)
-      ::Arel::Nodes::SqlLiteral.new viz.accept(@ctx, ::Arel::Collectors::SQLString.new).value
+      ::Arel::Nodes::SqlLiteral.new("WHERE #{::Arel::Nodes::And.new(@ast.wheres).to_sql(engine)}")
     end
   end
 end

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.0.0'
+  VERSION = '1.1.1'
 end

data/lib/arsi.rb

@@ -1,13 +1,16 @@
 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'
 
 module Arsi
   class UnscopedSQL < StandardError; end
-  Arel::TreeManager.include(ArelTreeManager)
+  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)
 
@@ -52,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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: arsi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Christopher Kintner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -139,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
@@ -153,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: []