active_record_proxy_adapters 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f404b61f94eec82c838124e111eba202e7fdbea61c07596739219749e7c76ac2
-  data.tar.gz: 930327b485fb9b7637a1b810c0cb52def9d0164777103f918862a9dd4a0a89e7
+  metadata.gz: f8eb66dc7f981575d9694d06749bd555f097e0304e479cef138271e4625c292d
+  data.tar.gz: 94671f1e33f3b48041e77fbb8f63c4f8044ffc719cfff0c434a68a96c6d11ac7
 SHA512:
-  metadata.gz: 4d0c6210521feb5db9ce40fc476607fb862d818e16feb23d795e95f20f20b8db0b1311049a5895f6e9795ba2740cdef140ecb6ec67f5f1c7c7aec759e0a4c2ca
-  data.tar.gz: 1134342f6be3093cb5a3ddaba514ef702adb611e5646a3abd3c68073fcb7060459a39a5845983733b4c5f0bc24d5928f57e8333b7741bbb8b3fa812d9472f066
+  metadata.gz: db126cae318181a3598d821a58801c33a9658fee002b93263e6c73dcee9d3c67362d76543aa0d9787ce6aa8cf28e054f646212aa3cc9c88d1afe63e19dc5257f
+  data.tar.gz: 7f21d5c7c4dd96ae1c0636523b039fddecd4cf0dc41e4af5cd6ce4907502da07792196be15734708a061d348010ff635e18fea8e6457e8b51cb308d526d898a4

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -18,21 +18,13 @@ module ActiveRecordProxyAdapters
     end
 
     def hijackable_methods
-      hijackable = %i[execute exec_query]
-
-      hijackable << :internal_exec_query if active_record_v7_1_or_greater?
-
-      hijackable
+      %i[execute exec_query internal_exec_query]
     end
 
     def active_record_v7?
       active_record_version >= Gem::Version.new("7.1") && active_record_version < Gem::Version.new("8.0")
     end
 
-    def active_record_v7_1_or_greater?
-      active_record_version >= Gem::Version.new("7.1")
-    end
-
     def active_record_v7_2_or_greater?
       active_record_version >= Gem::Version.new("7.2")
     end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -160,8 +160,7 @@ module ActiveRecordProxyAdapters
     end
 
     def pending_migration_connection?
-      active_record_context.active_record_v7_1_or_greater? &&
-        connection_class.name == "ActiveRecord::PendingMigrationConnection"
+      connection_class.name == "ActiveRecord::PendingMigrationConnection"
     end
 
     def connection_for(role, sql_string)

data/lib/active_record_proxy_adapters/railtie.rb

@@ -11,9 +11,15 @@ module ActiveRecordProxyAdapters
   # Hooks into rails boot process to extend ActiveRecord with the proxy adapter.
   class Railtie < Rails::Railtie
     require "active_record_proxy_adapters/middleware"
+    require "active_record_proxy_adapters/rake"
 
     initializer "active_record_proxy_adapters.configure_rails_initialization" do |app|
       app.middleware.use ActiveRecordProxyAdapters::Middleware
     end
+
+    rake_tasks do
+      ActiveRecordProxyAdapters::Rake.load_tasks
+      ActiveRecordProxyAdapters::Rake.enhance_db_tasks
+    end
   end
 end

data/lib/active_record_proxy_adapters/rake.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "rake"
+
+module ActiveRecordProxyAdapters
+  # Enhances all rails db rake tasks to stick to writer connection
+  module Rake
+    module_function
+
+    def load_tasks
+      Dir[rake_tasks_path].each { |rake_path| load(rake_path) }
+    end
+
+    def rake_tasks_path
+      File.join(__dir__, "tasks/**/*.rake")
+    end
+
+    def enhance_db_tasks
+      ::Rake::Task
+        .tasks
+        .select(&enhanceable_db_task?)
+        .each { |task| task.enhance([push_to_stack_rake_task.name], &pop_from_stack_and_reenable) }
+    end
+
+    def push_to_stack_rake_task
+      ::Rake::Task["arpa:push_to_stack"]
+    end
+
+    def pop_from_stack_rake_task
+      ::Rake::Task["arpa:pop_from_stack"]
+    end
+
+    def pop_from_stack_and_reenable
+      proc do
+        pop_from_stack_rake_task.invoke
+        [push_to_stack_rake_task, pop_from_stack_rake_task].each(&:reenable)
+      end
+    end
+
+    def enhanceable_db_task?
+      proc do |task|
+        task_name = task.name
+        task_name.start_with?("db:") && task_name != "db:load_config"
+      end
+    end
+  end
+end

data/lib/active_record_proxy_adapters/tasks/arpa.rake

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+namespace :arpa do
+  desc "Pushes to connected_to stack before rake task is executed"
+  task :push_to_stack do
+    writing_role = ActiveRecordProxyAdapters::ActiveRecordContext.writing_role
+
+    ActiveRecord::Base.connected_to_stack << {
+      role: writing_role,
+      shard: nil,
+      prevent_writes: false,
+      klasses: [ActiveRecord::Base]
+    }
+
+    Thread.current.thread_variable_set(:arpa_rake_pushed_to_stack, true)
+  end
+
+  desc "Pops from connected_to stack after rake task is invoked"
+  task :pop_from_stack do
+    if Thread.current.thread_variable_get(:arpa_rake_pushed_to_stack)
+      ActiveRecord::Base.connected_to_stack.pop
+      Thread.current.thread_variable_set(:arpa_rake_pushed_to_stack, nil)
+    end
+  end
+end

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Matt Cruz
@@ -154,8 +154,10 @@ files:
 - lib/active_record_proxy_adapters/railties/postgresql.rb
 - lib/active_record_proxy_adapters/railties/sqlite3.rb
 - lib/active_record_proxy_adapters/railties/trilogy.rb
+- lib/active_record_proxy_adapters/rake.rb
 - lib/active_record_proxy_adapters/sqlite3_proxy.rb
 - lib/active_record_proxy_adapters/synchronizable_configuration.rb
+- lib/active_record_proxy_adapters/tasks/arpa.rake
 - lib/active_record_proxy_adapters/trilogy_proxy.rb
 - lib/active_record_proxy_adapters/version.rb
 homepage: https://github.com/Nasdaq/active_record_proxy_adapters