rails-crud-tools 0.4.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '008fdf2673bcbae231ccc376ca9fdf1c7647ea2df3a3a5037e6beb60d4b67728'
-  data.tar.gz: c8006b6be02b313626f05cf021a3264a555ed54314f60c3e349aabdc680e28b4
+  metadata.gz: 829b5130856f1c43f416f97ed0055335696762ae8acf59f5047bd22139bef5cd
+  data.tar.gz: b8de3520453d467c6abe1d780a0fcf85cf6fc4ff3131ad9d5db273e70a90e700
 SHA512:
-  metadata.gz: 5f7b3dd252dad14b4e262d33e6f7c79fb784e791739ba0d74adb33fb6187f473d84d314c342f897ea97670b215bd8811a36195b070642252990f9f26d6adb142
-  data.tar.gz: fe6df88290d5132775d2e796e9a2b80f01ec3409f5ffc1b7c9438b4993f16681bd5e4c06e63cc91d46e4b31f8f5a8f8e7c707d9acfbde428d4f3faa4637773a5
+  metadata.gz: 4372a30ad4b7f7a26ec2409a3bd642999695f986b75890dabe95c424c1d9a2bc1975b17d69e26c13505aecf890e8d05818cc9d30f7768991bc51d52d2d930f77
+  data.tar.gz: ac731ed49cbcb4e118cd4e97fed91138b618d5af1288dfff0e9a62968d9c4991885f6fa0a09ef6d50c8059f45a013d854f7f2d9b736e4031af1f85ab04f2f31d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.6.0] - 2025-01-08
+- Support for select insert, select update, and select delete
+
+## [0.5.0] - 2025-01-07
+- Multiple table support
+
 ## [0.4.3] - 2025-01-07
 - Refactored `crud_notifications.rb`.
 - Modified to not execute the `setup` method in `tools.rb` when running commands.

data/lib/rails/crud/tools/crud_notifications.rb

@@ -1,4 +1,6 @@
-require 'active_support/notifications'
+# frozen_string_literal: true
+
+require "active_support/notifications"
 
 # Notification を使用して SQL クエリを監視するためのモジュール
 module Rails
@@ -12,7 +14,7 @@ module Rails
 
         if CrudConfig.instance.enabled
           # SQL クエリを監視する
-          ActiveSupport::Notifications.subscribe(/sql.active_record/) do |name, started, finished, unique_id, data|
+          ActiveSupport::Notifications.subscribe(/sql.active_record/) do |_name, _started, _finished, _unique_id, data|
             process_sql(data)
           end
         end
@@ -21,41 +23,115 @@ module Rails
         @subscribed = true
       end
 
+      OPERATION_UNKNOWN = "Unknown"
+
       def self.process_sql(data)
-        return unless data[:sql] =~ /(INSERT|UPDATE|DELETE|SELECT)/
-
-        operation = case ::Regexp.last_match(1)
-                    when "INSERT" then "C"
-                    when "SELECT" then "R"
-                    when "UPDATE" then "U"
-                    when "DELETE" then "D"
-                    else "Unknown"
-                    end
+        return unless data[:sql] =~ /\A\s*(INSERT|UPDATE|DELETE|SELECT)/i
 
-        match_data = data[:sql].match(/(?:INSERT INTO|UPDATE|DELETE FROM|FROM)\s+`?(\w+)`?/i)
-        unless match_data
-          # テーブル名が見つからない場合は警告を出力
-          CrudLogger.logger.warn "Table name not found in SQL: #{data[:sql]}"
+        case data[:sql]
+        when /\bINSERT INTO\b.*\bSELECT\b/i
+          handle_insert_select(data)
+        when /\bUPDATE\b.*\bSET\b.*\bSELECT\b/i
+          handle_update_select(data)
+        when /\bDELETE\b.*\bEXISTS\b.*\bSELECT\b/i
+          handle_delete_select(data)
+        else
+          handle_general_sql(data)
+        end
+
+        return unless CrudConfig.instance.sql_logging_enabled
+
+        # SQL ログを出力
+        CrudLogger.logger.info "#{data[:name]} - #{data[:sql]}"
+      end
+
+      def self.handle_insert_select(data)
+        # INSERT INTO ... SELECT の特別な処理
+        insert_table = data[:sql].match(/INSERT INTO\s+`?(\w+)`?/i)[1]
+        select_tables = data[:sql].scan(/SELECT .* FROM\s+`?(\w+)`?(?:\s*,\s*`?(\w+)`?)*|JOIN\s+`?(\w+)`?/i).flatten.compact.uniq
+
+        key, method = determine_key_and_method
+        if key.nil? || method.nil?
+          CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
           return
         end
 
-        # テーブル名を取得して CRUD 操作に追加
-        table_name = match_data[1]
+        CrudOperations.instance.add_operation(method, key, insert_table, "C")
+        select_tables.each do |select_table|
+          CrudOperations.instance.add_operation(method, key, select_table, "R")
+        end
+      end
+
+      def self.handle_update_select(data)
+        # UPDATE ... SET ... SELECT の特別な処理
+        update_table = data[:sql].match(/UPDATE\s+`?(\w+)`?/i)[1]
+        select_tables = data[:sql].scan(/SELECT .* FROM\s+`?(\w+)`?(?:\s*,\s*`?(\w+)`?)*|JOIN\s+`?(\w+)`?/i).flatten.compact.uniq
+
         key, method = determine_key_and_method
         if key.nil? || method.nil?
           CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
           return
         end
 
-        CrudOperations.instance.add_operation(method, key, table_name, operation)
+        CrudOperations.instance.add_operation(method, key, update_table, "U")
+        select_tables.each do |select_table|
+          CrudOperations.instance.add_operation(method, key, select_table, "R")
+        end
+      end
 
-        return unless CrudConfig.instance.sql_logging_enabled
+      def self.handle_delete_select(data)
+        # DELETE ... WHERE EXISTS ... SELECT の特別な処理
+        delete_table = data[:sql].match(/DELETE FROM\s+`?(\w+)`?/i)[1]
+        select_tables = data[:sql].scan(/SELECT .* FROM\s+`?(\w+)`?(?:\s*,\s*`?(\w+)`?)*|JOIN\s+`?(\w+)`?/i).flatten.compact.uniq
 
-        # SQL ログを出力
-        CrudLogger.logger.info "#{data[:name]} - #{data[:sql]}"
+        key, method = determine_key_and_method
+        if key.nil? || method.nil?
+          CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
+          return
+        end
 
+        CrudOperations.instance.add_operation(method, key, delete_table, "D")
+        select_tables.each do |select_table|
+          CrudOperations.instance.add_operation(method, key, select_table, "R")
+        end
       end
 
+      def self.handle_general_sql(data)
+        operation = if (match = data[:sql].match(/\A\s*(INSERT|UPDATE|DELETE|SELECT)/i))
+                      case match[1].upcase
+                      when "INSERT" then "C"
+                      when "SELECT" then "R"
+                      when "UPDATE" then "U"
+                      when "DELETE" then "D"
+                      else OPERATION_UNKNOWN
+                      end
+                    else
+                      OPERATION_UNKNOWN
+                    end
+
+        if operation == OPERATION_UNKNOWN
+          warn "Warning: Unknown SQL operation. #{data[:name]} - #{data[:sql]}"
+          return
+        end
+
+        table_names = data[:sql].scan(/(?:INSERT INTO|UPDATE|DELETE FROM|FROM|JOIN)\s+`?(\w+)`?(?:\s*,\s*`?(\w+)`?)*/i).flatten.compact.uniq
+        if table_names.empty?
+          # テーブル名が見つからない場合は警告を出力
+          CrudLogger.logger.warn "Table name not found in SQL: #{data[:sql]}"
+          return
+        end
+
+        key, method = determine_key_and_method
+        if key.nil? || method.nil?
+          CrudLogger.logger.warn "Request not found. #{data[:name]} - #{data[:sql]}"
+          return
+        end
+
+        # テーブル名を取得して CRUD 操作に追加
+        table_names.each do |table_name|
+          CrudOperations.instance.add_operation(method, key, table_name, operation)
+        end
+      end
       # キーとメソッドを決定する
       def self.determine_key_and_method
         request = Thread.current[:crud_request]
@@ -63,8 +139,8 @@ module Rails
 
         if request
           method = request.request_method
-          controller = request.params['controller']
-          action = request.params['action']
+          controller = request.params["controller"]
+          action = request.params["action"]
           key = "#{controller}##{action}"
         elsif sidekiq_job_class
           key = sidekiq_job_class
@@ -75,7 +151,6 @@ module Rails
 
         [key, method]
       end
-
     end
   end
-end
+end

data/lib/rails/crud/tools/version.rb

@@ -3,7 +3,7 @@
 module Rails
   module Crud
     module Tools
-      VERSION = "0.4.3"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-crud-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.0
 platform: ruby
 authors:
 - yhijikata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord