From 92306e85ca55a9f741f8ffda4a07d7aa4ef8642a Mon Sep 17 00:00:00 2001 From: Eric Saxby Date: Thu, 24 Jul 2014 13:05:14 -0700 Subject: [PATCH] Require makara in makara abstract adapter When using rails 4.1.2 release candidates, servers are unable to start because of an error, ``` uninitialized constant Makara from /path/to/bundle/ruby/2.1.0/bundler/gems/makara-59b01c0ecfec/lib/active_record/connection_adapters/makara_abstract_adapter.rb:4:in `' from /path/to/bundle/ruby/2.1.0/bundler/gems/makara-59b01c0ecfec/lib/active_record/connection_adapters/makara_abstract_adapter.rb:3:in `' from /path/to/bundle/ruby/2.1.0/bundler/gems/makara-59b01c0ecfec/lib/active_record/connection_adapters/makara_postgresql_adapter.rb:1:in `' ``` I think that ActiveRecord must be requiring files in some slightly different order than expected. --- lib/active_record/connection_adapters/makara_abstract_adapter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/active_record/connection_adapters/makara_abstract_adapter.rb b/lib/active_record/connection_adapters/makara_abstract_adapter.rb index 7ae18fa1..4fc3ba7b 100644 --- a/lib/active_record/connection_adapters/makara_abstract_adapter.rb +++ b/lib/active_record/connection_adapters/makara_abstract_adapter.rb @@ -1,4 +1,5 @@ require 'active_record' +require 'makara' module ActiveRecord module ConnectionAdapters