data_fabric 1.3.2 → 1.3.3

data/CHANGELOG

@@ -1,5 +1,12 @@
 DataFabric changelog
 
+v1.3.3 - 2011-10-29
+
+- Added ConnectionProxy#respond_to? which delegates to underlying connection
+(Paul Gross and Dan Manges)
+- Remove specific handling of nested transactions and let the underlying
+connection handle it (Paul Gross and Dan Manges)
+
 v1.3.2 - 2011-06-02
 
 - Fix problem fetching spec for connection pool.

data/example30/db/schema.rb

@@ -0,0 +1,29 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20080702154820) do
+
+  create_table "accounts", :force => true do |t|
+    t.string   "name"
+    t.string   "shard"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "figments", :force => true do |t|
+    t.integer  "account_id"
+    t.integer  "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/example30/log/development.log

@@ -0,0 +1,66 @@
+  SQL (0.4ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  select sqlite_version(*)
+  SQL (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (0.9ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to CreateAccounts (20080702154628)
+  SQL (0.5ms)  CREATE TABLE "accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "shard" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20080702154628')
+Migrating to CreateFigments (20080702154820)
+  SQL (0.5ms)  CREATE TABLE "figments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "account_id" integer, "value" integer, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20080702154820')
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("accounts")
+  SQL (0.0ms)  PRAGMA index_list("figments")
+  SQL (0.5ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.2ms)  select sqlite_version(*)
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.9ms)  CREATE TABLE "accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "shard" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.3ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.4ms)  CREATE TABLE "figments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "account_id" integer, "value" integer, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (1.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT version FROM "schema_migrations"
+  SQL (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20080702154820')
+  SQL (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20080702154628')

data/example30/log/test.log

@@ -0,0 +1,170 @@
+  SQL (0.4ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  select sqlite_version(*)
+  SQL (1.6ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (0.0ms)  PRAGMA index_list("schema_migrations")
+  SQL (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+Migrating to CreateAccounts (20080702154628)
+  SQL (0.4ms)  CREATE TABLE "accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "shard" varchar(255), "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20080702154628')
+Migrating to CreateFigments (20080702154820)
+  SQL (0.4ms)  CREATE TABLE "figments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "account_id" integer, "value" integer, "created_at" datetime, "updated_at" datetime) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20080702154820')
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
+  SQL (0.1ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.0ms)  PRAGMA index_list("accounts")
+  SQL (0.0ms)  PRAGMA index_list("figments")
+  Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT "accounts".* FROM "accounts"
+Rendered accounts/index.html.erb within layouts/application (7.1ms)
+Completed 200 OK in 40ms (Views: 11.3ms | ActiveRecord: 0.9ms)
+  SQL (1.0ms)  delete from figments
+  SQL (1.0ms)  delete from figments
+  SQL (0.1ms)  select count(*) as c from figments
+  SQL (0.1ms)  select count(*) as c from figments
+
+
+Started GET "/accounts" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT "accounts".* FROM "accounts"
+Rendered accounts/index.html.erb within layouts/application (33.1ms)
+Completed 200 OK in 64ms (Views: 35.3ms | ActiveRecord: 3.2ms)
+
+
+Started POST "/accounts" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#create as HTML
+  Parameters: {"acct"=>{"name"=>"mike", "shard"=>"0"}}
+  SQL (0.2ms)   SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+  AREL (0.3ms)  INSERT INTO "accounts" ("name", "shard", "created_at", "updated_at") VALUES ('mike', '0', '2011-10-30 00:25:50.668938', '2011-10-30 00:25:50.668938')
+Redirected to http://www.example.com/
+Completed 302 Found in 9ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts"
+Rendered accounts/index.html.erb within layouts/application (1.8ms)
+Completed 200 OK in 3ms (Views: 2.3ms | ActiveRecord: 0.7ms)
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."name" = 'mike') LIMIT 1
+
+
+Started GET "/accounts/1033447817/choose" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#choose as HTML
+  Parameters: {"id"=>"1033447817"}
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447817) LIMIT 1
+Redirected to http://www.example.com/
+Completed 302 Found in 1ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447817) LIMIT 1
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts"
+  Figment Load (0.4ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447817)
+Rendered accounts/index.html.erb within layouts/application (10.2ms)
+Completed 200 OK in 12ms (Views: 10.4ms | ActiveRecord: 0.9ms)
+  SQL (0.2ms)  SELECT COUNT(*) FROM "figments" WHERE ("figments".account_id = 1033447817)
+
+
+Started POST "/figments" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by FigmentsController#create as HTML
+  Parameters: {"figment"=>{"value"=>"14"}}
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447817) LIMIT 1
+  AREL (0.4ms)  INSERT INTO "figments" ("account_id", "value", "created_at", "updated_at") VALUES (1033447817, 14, '2011-10-30 00:25:50.718857', '2011-10-30 00:25:50.718857')
+Redirected to http://www.example.com/
+Completed 302 Found in 45ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447817) LIMIT 1
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts"
+  Figment Load (0.2ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447817)
+  CACHE (0.0ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447817) LIMIT 1
+Rendered accounts/index.html.erb within layouts/application (8.1ms)
+Completed 200 OK in 10ms (Views: 8.4ms | ActiveRecord: 1.2ms)
+  Figment Load (0.2ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447817)
+  SQL (0.1ms)  select count(*) as c from figments
+  SQL (0.1ms)  select count(*) as c from figments
+
+
+Started GET "/accounts" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts"
+Rendered accounts/index.html.erb within layouts/application (1.8ms)
+Completed 200 OK in 3ms (Views: 2.3ms | ActiveRecord: 0.6ms)
+
+
+Started POST "/accounts" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#create as HTML
+  Parameters: {"acct"=>{"name"=>"bob", "shard"=>"1"}}
+  AREL (0.1ms)  INSERT INTO "accounts" ("name", "shard", "created_at", "updated_at") VALUES ('bob', '1', '2011-10-30 00:25:50.780179', '2011-10-30 00:25:50.780179')
+Redirected to http://www.example.com/
+Completed 302 Found in 1ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts"
+Rendered accounts/index.html.erb within layouts/application (1.8ms)
+Completed 200 OK in 3ms (Views: 2.2ms | ActiveRecord: 0.3ms)
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."name" = 'bob') LIMIT 1
+
+
+Started GET "/accounts/1033447818/choose" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#choose as HTML
+  Parameters: {"id"=>"1033447818"}
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447818) LIMIT 1
+Redirected to http://www.example.com/
+Completed 302 Found in 1ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447818) LIMIT 1
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts"
+  Figment Load (0.3ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447818)
+Rendered accounts/index.html.erb within layouts/application (4.4ms)
+Completed 200 OK in 6ms (Views: 4.5ms | ActiveRecord: 0.7ms)
+  SQL (0.1ms)  SELECT COUNT(*) FROM "figments" WHERE ("figments".account_id = 1033447818)
+
+
+Started POST "/figments" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by FigmentsController#create as HTML
+  Parameters: {"figment"=>{"value"=>"66"}}
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447818) LIMIT 1
+  AREL (0.3ms)  INSERT INTO "figments" ("account_id", "value", "created_at", "updated_at") VALUES (1033447818, 66, '2011-10-30 00:25:50.801327', '2011-10-30 00:25:50.801327')
+Redirected to http://www.example.com/
+Completed 302 Found in 4ms
+
+
+Started GET "/" for 127.0.0.1 at 2011-10-29 17:25:50 -0700
+  Processing by AccountsController#index as HTML
+  Account Load (0.2ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447818) LIMIT 1
+  Account Load (0.1ms)  SELECT "accounts".* FROM "accounts"
+  Figment Load (0.2ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447818)
+  CACHE (0.0ms)  SELECT "accounts".* FROM "accounts" WHERE ("accounts"."id" = 1033447818) LIMIT 1
+Rendered accounts/index.html.erb within layouts/application (3.4ms)
+Completed 200 OK in 5ms (Views: 3.6ms | ActiveRecord: 1.1ms)
+  Figment Load (0.2ms)  SELECT "figments".* FROM "figments" WHERE ("figments".account_id = 1033447818)
+  SQL (0.1ms)  select count(*) as c from figments
+  SQL (0.1ms)  select count(*) as c from figments

data/lib/data_fabric.rb

@@ -41,7 +41,8 @@ require 'data_fabric/version'
 module DataFabric
 
   def self.logger
-    @logger ||= ActiveRecord::Base.logger || Logger.new('/dev/null')
+    devnull = RUBY_PLATFORM =~ /w32/ ? 'nul' : '/dev/null'
+    @logger ||= ActiveRecord::Base.logger || Logger.new(devnull)
   end
   
   def self.logger=(log)

data/lib/data_fabric/connection_proxy.rb

@@ -17,7 +17,7 @@ module DataFabric
       @proc.call
     end
   end
-  
+
   class PoolProxy
     def initialize(proxy)
       @proxy = proxy
@@ -47,7 +47,7 @@ module DataFabric
       end
     end
 
-    %w(columns columns_hash table_exists? primary_keys).each do |name|
+    %w(columns column_defaults columns_hash table_exists? primary_keys).each do |name|
       define_method(name.to_sym) do |*args|
         @proxy.current_pool.send(name.to_sym, *args)
       end
@@ -61,7 +61,7 @@ module DataFabric
 
   class ConnectionProxy
     cattr_accessor :shard_pools
-    
+
     def initialize(model_class, options)
       @model_class = model_class      
       @replicated  = options[:replicated]
@@ -79,16 +79,15 @@ module DataFabric
     delegate :insert_many, :to => :master # ar-extensions bulk insert support
 
     def transaction(start_db_transaction = true, &block)
-      # Transaction is not re-entrant in SQLite 3 so we
-      # need to track if we've already started an XA to avoid
-      # calling it twice.
-      return yield if in_transaction?
-
       with_master do
-        connection.transaction(start_db_transaction, &block) 
+        connection.transaction(start_db_transaction, &block)
       end
     end
 
+    def respond_to?(method)
+      super || connection.respond_to?(method)
+    end
+
     def method_missing(method, *args, &block)
       DataFabric.logger.debug { "Calling #{method} on #{connection}" }
       connection.send(method, *args, &block)
@@ -106,7 +105,7 @@ module DataFabric
     ensure
       set_role(old_role)
     end
-    
+
     def connected?
       current_pool.connected?
     end
@@ -123,21 +122,16 @@ module DataFabric
         ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec_for(config))
       end
     end
-    
-    private
 
-    def in_transaction?
-      current_role == 'master'
-    end
+    private
 
     def spec_for(config)
-      # XXX This looks pretty fragile.  Will break if AR changes how it initializes connections and adapters.
       config = config.symbolize_keys
       adapter_method = "#{config[:adapter]}_connection"
       initialize_adapter(config[:adapter])
       ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
     end
-    
+
     def initialize_adapter(adapter)
       begin
         require 'rubygems'
@@ -150,7 +144,7 @@ module DataFabric
           raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
         end
       end
-    end      
+    end
 
     def connection_name_builder
       @connection_name_builder ||= begin
@@ -163,11 +157,11 @@ module DataFabric
         clauses
       end
     end
-    
+
     def set_role(role)
       Thread.current[:data_fabric_role] = role
     end
-    
+
     def current_role
       Thread.current[:data_fabric_role] || 'slave'
     end
@@ -177,4 +171,4 @@ module DataFabric
     end
   end
 
-end
+end

data/lib/data_fabric/version.rb

@@ -1,5 +1,5 @@
 module DataFabric
   module Version
-    STRING = '1.3.2'
+    STRING = '1.3.3'
   end
 end

data/test/connection_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 require 'flexmock/test_unit'
 
+require 'active_record/connection_adapters/mysql_adapter'
+
 class PrefixModel < ActiveRecord::Base
   data_fabric :prefix => 'prefix'
 end
@@ -16,33 +18,37 @@ end
 class AdapterMock < ActiveRecord::ConnectionAdapters::AbstractAdapter
   # Minimum required to perform a find with no results.
   # Works on 2.3.10, 3.0.0 and 3.0.3.
-   def columns(table_name, name=nil)
-     [ActiveRecord::ConnectionAdapters::Column.new('id', 0, :integer, false)]
-   end
-   def primary_key(name)
-     :id
-   end
-   def adapter_name
-     'mysql'
-   end
-   def select(sql, name=nil)
-     []
-   end
-   def execute(sql, name=nil)
-     []
-   end
-   def tables
-     ["enchiladas", "the_whole_burritos"]
-   end
-   def table_exists?(name)
-     true
-   end
-   def last_inserted_id(result)
-     1
-   end
-   def method_missing(name, *args)
-     raise ArgumentError, "#{self.class.name} missing '#{name}': #{args.inspect}"
-   end
+  def columns(table_name, name=nil)
+    [ActiveRecord::ConnectionAdapters::Column.new('id', 0, :integer, false)]
+  end
+  def primary_key(name)
+    :id
+  end
+  def adapter_name
+    'mysql'
+  end
+  def select(sql, name=nil, bindings=nil)
+    []
+  end
+  def execute(sql, name=nil)
+    []
+  end
+  def tables
+    ["enchiladas", "the_whole_burritos"]
+  end
+  def table_exists?(name)
+    true
+  end
+  def last_inserted_id(result)
+    1
+  end
+  def method_missing(name, *args)
+    raise ArgumentError, "#{self.class.name} missing '#{name}': #{args.inspect}"
+  end
+
+  def self.visitor_for(pool)
+    Arel::Visitors::MySQL.new(pool)
+  end
 end
 
 class RawConnection
@@ -58,12 +64,12 @@ class ConnectionTest < Test::Unit::TestCase
     meth = PrefixModel.methods.first.is_a?(Symbol) ? :data_fabric : 'data_fabric'
     assert PrefixModel.methods.include?(meth)
   end
-  
+
   def test_prefix_connection_name
     setup_configuration_for PrefixModel, 'prefix_test'
     assert_equal 'prefix_test', PrefixModel.connection.connection_name
   end
-  
+
   def test_shard_connection_name
     setup_configuration_for ShardModel, 'city_austin_test'
     # ensure unset means error
@@ -78,7 +84,24 @@ class ConnectionTest < Test::Unit::TestCase
       ShardModel.connection.connection_name
     end
   end
-  
+
+  def test_respond_to_connection_methods
+    setup_configuration_for ShardModel, 'city_austin_test'
+    DataFabric.activate_shard(:city => 'austin', :category => 'art') do
+      assert ShardModel.connection.respond_to?(:columns)
+      assert ShardModel.connection.respond_to?(:primary_key)
+      assert !ShardModel.connection.respond_to?(:nonexistent_method)
+    end
+  end
+
+  def test_respond_to_connection_proxy_methods
+    setup_configuration_for ShardModel, 'city_austin_test'
+    DataFabric.activate_shard(:city => 'austin', :category => 'art') do
+      assert ShardModel.connection.respond_to?(:with_master)
+      assert !ShardModel.connection.respond_to?(:nonexistent_method)
+    end
+  end
+
   def test_enchilada
     setup_configuration_for TheWholeEnchilada, 'fiveruns_city_dallas_test_slave'
     setup_configuration_for TheWholeEnchilada, 'fiveruns_city_dallas_test_master'
@@ -89,7 +112,7 @@ class ConnectionTest < Test::Unit::TestCase
       assert_raises ActiveRecord::RecordNotFound do
         TheWholeEnchilada.find(1)
       end
-      
+
       # Should use the master
       mmmm = TheWholeEnchilada.new
       mmmm.instance_variable_set(:@attributes, { 'id' => 1 })
@@ -98,7 +121,7 @@ class ConnectionTest < Test::Unit::TestCase
       end
       # ...but immediately set it back to default to the slave
       assert_equal 'fiveruns_city_dallas_test_slave', TheWholeEnchilada.connection.connection_name
-      
+
       # Should use the master
       TheWholeEnchilada.transaction do
         mmmm.save!
@@ -114,11 +137,10 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   private
-  
+
   def setup_configuration_for(clazz, name)
-    flexmock(ActiveRecord::ConnectionAdapters::ConnectionPool).new_instances.should_receive(
-      :new_connection).and_return(AdapterMock.new(RawConnection.new))
+    flexmock(ActiveRecord::Base).should_receive(:mysql_connection).and_return(AdapterMock.new(RawConnection.new))
     ActiveRecord::Base.configurations ||= HashWithIndifferentAccess.new
     ActiveRecord::Base.configurations[name] = HashWithIndifferentAccess.new({ :adapter => 'mysql', :database => name, :host => 'localhost'})
   end
-end
+end

data/test/thread_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'erb'
 
 class ThreadTest < Test::Unit::TestCase
-  
+
   MUTEX = Mutex.new
 
   def test_class_and_instance_connections
@@ -18,7 +18,7 @@ class ThreadTest < Test::Unit::TestCase
     iconn = ThreadedEnchilada.new.connection
     assert_equal cconn, iconn
   end
-  
+
   def xtest_threaded_access
     clear_databases
 
@@ -48,7 +48,7 @@ class ThreadTest < Test::Unit::TestCase
       end
     end
     threads.each { |thread| thread.join }
-    
+
     counts.each_pair do |city, count| 
       DataFabric.activate_shard(:city => city) do
         # slave should be empty
@@ -62,9 +62,9 @@ class ThreadTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   private
-  
+
   def clear_databases
     ActiveRecord::Base.configurations = { 'test' => { :adapter => 'mysql', :host => 'localhost', :database => 'mysql' } }
     ActiveRecord::Base.establish_connection 'test'
@@ -77,7 +77,7 @@ class ThreadTest < Test::Unit::TestCase
     end
     ActiveRecord::Base.clear_active_connections!
   end
-  
+
   def using_connection(&block)
     ActiveRecord::Base.connection.instance_eval(&block)
   end

metadata

@@ -1,52 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: data_fabric
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.3
   prerelease: 
-  version: 1.3.2
 platform: ruby
-authors: 
+authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: flexmock
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157070860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157070860
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2157069320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2157069320
 description: Sharding and replication support for ActiveRecord
 email: mperham@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/data_fabric/connection_proxy.rb
 - lib/data_fabric/extensions.rb
 - lib/data_fabric/version.rb
-- lib/data_fabric/version.rbc
 - lib/data_fabric.rb
 - example23/app/controllers/accounts_controller.rb
 - example23/app/controllers/application_controller.rb
@@ -122,11 +118,20 @@ files:
 - example30/config/locales/en.yml
 - example30/config/routes.rb
 - example30/config.ru
+- example30/db/development.sqlite3
 - example30/db/migrate/20080702154628_create_accounts.rb
 - example30/db/migrate/20080702154820_create_figments.rb
+- example30/db/s0_development.sqlite3
+- example30/db/s0_test.sqlite3
+- example30/db/s1_development.sqlite3
+- example30/db/s1_test.sqlite3
+- example30/db/schema.rb
 - example30/db/seeds.rb
+- example30/db/test.sqlite3
 - example30/Gemfile
 - example30/Gemfile.lock
+- example30/log/development.log
+- example30/log/test.log
 - example30/Rakefile
 - example30/README
 - example30/script/rails
@@ -152,32 +157,29 @@ files:
 - test/vr_dallas_slave.db
 homepage: http://github.com/mperham/data_fabric
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sharding and replication support for ActiveRecord
-test_files: 
+test_files:
 - test/connection_test.rb
 - test/database.yml
 - test/database.yml.mysql

data/lib/data_fabric/version.rbc

@@ -1,203 +0,0 @@
-!RBIX
-17831730954501249321
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-28
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-10
-DataFabric
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-10
-DataFabric
-i
-28
-5
-66
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-7
-Version
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-7
-Version
-i
-12
-5
-66
-65
-7
-0
-7
-1
-64
-49
-2
-2
-11
-I
-3
-I
-0
-I
-0
-I
-0
-n
-p
-3
-x
-6
-STRING
-s
-5
-1.3.1
-x
-9
-const_set
-p
-3
-I
-2
-I
-3
-I
-c
-x
-61
-/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-2
-I
-2
-I
-1c
-x
-61
-/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-0
-I
-1
-I
-1c
-x
-61
-/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
-p
-0