From 73eeb51ea59c62dc528ad71a439bd2088edad850 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 20 Aug 2012 11:10:42 -0700
Subject: initialize instance variables to avoid conditionals

---
 .../connection_adapters/abstract/database_statements.rb          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters/abstract')

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?
-- 
cgit v1.2.3