Allow lax includes to be turned on by default.

unixcharles · Mar 5, 2014 · b867435 · b867435
1 parent bf860fa
commit b867435
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/activerecord_lax_includes.rb b/lib/activerecord_lax_includes.rb
@@ -24,7 +24,12 @@ def filtered_records_by_reflection(association)
     end
 
     def lax_includes_enabled?
-      !!Thread.current[:active_record_lax_includes_enabled]
+      result = Thread.current[:active_record_lax_includes_enabled]
+      if result.nil?
+        result = Rails.configuration.respond_to?(:active_record_lax_includes_enabled) &&
+                    Rails.configuration.active_record_lax_includes_enabled
+      end
+      result
     end
   end