@@ -1,3 +1 @@ -require 'data_fabric' - -ActiveRecord::Base.send(:include, DataFabric) \ No newline at end of file +DataFabric.init \ No newline at end of file init.rb @@ -36,6 +36,10 @@ require 'active_record' # end module DataFabric + def self.init + ActiveRecord::Base.send(:include, self) + end + def self.activate_shard(group, instance, &block) ensure_setup Thread.current[:shards][group.to_s] = instance.to_s @@ -157,7 +161,7 @@ module DataFabric unless already_connected_to? conn_name @cached_connection = begin config = ActiveRecord::Base.configurations[conn_name] - raise ArgumentError, "Unknown database config: #{conn_name}" unless config + raise ArgumentError, "Unknown database config: #{conn_name}, have #{ActiveRecord::Base.configurations.inspect}" unless config @model_class.establish_connection config conn = @model_class.connection # conn.verify! 0 lib/data_fabric.rb 13d819f331ba17f50274bcadbacf6b7f7789ca2f Mike Perham mperham@gmail.com http://github.com/fiveruns/data_fabric/commit/58747399ae4767f1c2e9933f3937464c943f9306 58747399ae4767f1c2e9933f3937464c943f9306 2008-02-15T08:42:33-08:00 2008-02-15T08:42:33-08:00 Update how data_fabric is initialized so it works with ActiveSupport's loading b96a268edc37b75ba3e11b69fb37cbf499d31484 Mike Perham mperham@gmail.com