diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-20 11:10:42 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-20 15:08:48 -0700 |
| commit | 73eeb51ea59c62dc528ad71a439bd2088edad850 (patch) | |
| tree | d071dc7d325b877d05512826f9c42c86fa28e4ef | |
| parent | d0d4ef6e8be08ab4f6a7faa2b3a5ef8423a99350 (diff) | |
| download | rails-73eeb51ea59c62dc528ad71a439bd2088edad850.tar.gz rails-73eeb51ea59c62dc528ad71a439bd2088edad850.tar.bz2 rails-73eeb51ea59c62dc528ad71a439bd2088edad850.zip | |
initialize instance variables to avoid conditionals
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index b0b51f540c..8a1787548f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -1,6 +1,12 @@ module ActiveRecord module ConnectionAdapters # :nodoc: module DatabaseStatements + def initialize + super + @_current_transaction_records = [] + @transaction_joinable = nil + end + # Converts an arel AST to SQL def to_sql(arel, binds = []) if arel.respond_to?(:ast) @@ -167,7 +173,7 @@ module ActiveRecord def transaction(options = {}) options.assert_valid_keys :requires_new, :joinable - last_transaction_joinable = defined?(@transaction_joinable) ? @transaction_joinable : nil + last_transaction_joinable = @transaction_joinable if options.has_key?(:joinable) @transaction_joinable = options[:joinable] else @@ -176,7 +182,6 @@ module ActiveRecord requires_new = options[:requires_new] || !last_transaction_joinable transaction_open = false - @_current_transaction_records ||= [] begin if block_given? |