@@ -20,9 +20,6 @@ module ActiveReload def self.setup_for(master, slave = nil) slave ||= ActiveRecord::Base slave.send :include, ActiveRecordConnectionMethods - # extend observer to always use the master database - # observers only get triggered on writes, so shouldn't be a performance hit - # removes a race condition if you are using conditionals in the observer ActiveRecord::Observer.send :include, ActiveReload::ObserverExtensions ActiveRecord::Base.active_connections[slave.name] = new(master, slave) end @@ -44,7 +41,7 @@ module ActiveReload delegate :insert, :update, :delete, :create_table, :rename_table, :drop_table, :add_column, :remove_column, :change_column, :change_column_default, :rename_column, :add_index, :remove_index, :initialize_schema_information, - :dump_schema_information, :to => :master + :dump_schema_information, :execute, :to => :master def transaction(start_db_transaction = true, &block) with_master { @current.transaction(start_db_transaction, &block) } @@ -64,7 +61,10 @@ module ActiveReload connection.with_master { reload_without_master } end end - + + # extend observer to always use the master database + # observers only get triggered on writes, so shouldn't be a performance hit + # removes a race condition if you are using conditionals in the observer module ObserverExtensions def self.included(base) base.alias_method_chain :update, :masterdb lib/active_reload/connection_proxy.rb a6933cae9b2634461006c17f7a5412237ef3e8bb rick technoweenie@gmail.com http://github.com/technoweenie/masochism/commit/cccfa41154f28953944f063c9682a4a05308e861 cccfa41154f28953944f063c9682a4a05308e861 2008-05-18T16:49:44-07:00 2008-05-18T16:49:44-07:00 delegate #execute to master [javier ramirez] c1dfc23e5b75ddfde507ffcce48a5e984464cb23 rick technoweenie@gmail.com