@@ -32,9 +32,7 @@ module DataFabric :change_column, :change_column_default, :rename_column, :add_index, :remove_index, :initialize_schema_information, :dump_schema_information, :execute, :execute_ignore_duplicate, :to => :master - def cache(&block) - connection.cache(&block) - end + delegate :insert_many, :to => :master # ar-extensions bulk insert support def transaction(start_db_transaction = true, &block) with_master { connection.transaction(start_db_transaction, &block) } lib/data_fabric/ar20.rb @@ -15,7 +15,9 @@ class DatabaseTest < Test::Unit::TestCase end end - def test_live_burrito + def test_ar22_features + return unless ar22? + DataFabric.activate_shard :city => :dallas do assert_equal 'fiveruns_city_dallas_test_slave', TheWholeBurrito.connection.connection_name @@ -30,6 +32,16 @@ class DatabaseTest < Test::Unit::TestCase assert_match 'vr_dallas_slave', burrito.name assert TheWholeBurrito.connected? + end + end + + def test_live_burrito + DataFabric.activate_shard :city => :dallas do + assert_equal 'fiveruns_city_dallas_test_slave', TheWholeBurrito.connection.connection_name + + # Should use the slave + burrito = TheWholeBurrito.find(1) + assert_match 'vr_dallas_slave', burrito.name # Should use the master burrito.reload test/database_test.rb 28881ebe870ee682a4a687e4ff067ea8b18b42d0 Mike Perham mperham@gmail.com http://github.com/fiveruns/data_fabric/commit/c6d65c18111db12745f58b627cd086d2ad58340a c6d65c18111db12745f58b627cd086d2ad58340a 2008-12-01T18:21:02-08:00 2008-12-01T18:21:02-08:00 Add insert_many to delegated methods Fix tests under < ar2.2 da7d2d51f07c77bf077636659d5b3e9257d6872a Mike Perham mperham@gmail.com