switchman 1.0.0 → 1.2.0

data/spec/dummy/tmp/cache/383/6A0/shard%2F2809

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2809;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395351017.159604:@expires_in0

data/spec/dummy/tmp/cache/383/6C0/shard%2F2746

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348920.634311:@value":nil

data/spec/dummy/tmp/cache/383/6D0/shard%2F2755

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2755;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395348973.031633:@expires_in0

data/spec/dummy/tmp/cache/383/6E0/shard%2F2764

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2764;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395349371.95282:@expires_in0

data/spec/dummy/tmp/cache/383/700/shard%2F2782

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2782;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395350401.1010911:@expires_in0

data/spec/dummy/tmp/cache/383/700/shard%2F2863

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi/I"	name;TI"switchman_test_shard_2863;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395351418.1376588:@expires_in0

data/spec/dummy/tmp/cache/384/6A0/shard%2F2477

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�	I"	name;TI"switchman_test_shard_2477;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395264726.5928588:@expires_in0

data/spec/dummy/tmp/cache/384/6E0/shard%2F2594

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi"
+I"	name;TI"switchman_test_shard_2594;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395345225.275854:@expires_in0

data/spec/dummy/tmp/cache/384/6E0/shard%2F2756

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2756;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395348973.1136022:@expires_in0

data/spec/dummy/tmp/cache/384/6F0/shard%2F2765

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2765;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395349372.035467:@expires_in0

data/spec/dummy/tmp/cache/384/710/shard%2F2864

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi0I"	name;TI"switchman_test_shard_2864;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395351418.1517792:@expires_in0

data/spec/dummy/tmp/cache/384/720/shard%2F2873

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395351428.7750468:@expires_in0

data/spec/dummy/tmp/cache/385/670/shard%2F2199

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395258204.944012:@expires_in0

data/spec/dummy/tmp/cache/385/690/shard%2F2379

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETiK	I"	name;TI"switchman_test_shard_2379;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395261397.955012:@expires_in0

data/spec/dummy/tmp/cache/385/6F0/shard%2F2595

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi#
+I"	name;TI"switchman_test_shard_2595;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395345225.515469:@expires_in0

data/spec/dummy/tmp/cache/385/710/shard%2F2694

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348853.244767:@value":nil

data/spec/dummy/tmp/cache/386/6B0/shard%2F3199

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETiI"	name;TI"switchman_test_shard_3199;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395766435.693439:@expires_in0

data/spec/dummy/tmp/cache/386/6C0/shard%2F2479

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�	I"	name;TI"switchman_test_shard_2479;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395264761.2054908:@expires_in0

data/spec/dummy/tmp/cache/386/700/shard%2F2758

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2758;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395349017.004371:@expires_in0

data/spec/dummy/tmp/cache/386/720/shard%2F2776

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2776;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395350269.0577972:@expires_in0

data/spec/dummy/tmp/cache/386/730/shard%2F2866

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395351418.236246:@expires_in0

data/spec/dummy/tmp/cache/387/710/shard%2F2597

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi%
+I"	name;TI"switchman_test_shard_2597;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395345294.7767859:@expires_in0

data/spec/dummy/tmp/cache/388/720/shard%2F2598

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi&
+I"	name;TI"switchman_test_shard_2598;TI"database_server_id;TI"1;TI"default;TF:@created_atf1395345294.810807:@expires_in0

data/spec/dummy/tmp/cache/389/750/shard%2F2779

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2779;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395350364.3173969:@expires_in0

data/spec/dummy/tmp/cache/389/760/shard%2F2869

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi5I"	name;TI"switchman_test_shard_2869;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1395351428.434088:@expires_in0

data/spec/dummy/tmp/cache/3A2/E80/shard%2F10010

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395249172.588981:@value":nil

data/spec/dummy/tmp/cache/3A6/F80/shard%2F13200

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395766435.380675:@expires_in0

data/spec/dummy/tmp/cache/3A8/F70/shard%2F12203

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395258225.299445:@expires_in0

data/spec/dummy/tmp/cache/3A8/F80/shard%2F12212

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395258895.314236:@expires_in0

data/spec/dummy/tmp/cache/3A9/F50/shard%2F12015

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395253362.161854:@value":nil

data/spec/dummy/tmp/cache/3A9/FC0/shard%2F12240

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395259536.8502998:@expires_in0

data/spec/dummy/tmp/cache/3A9/FF0/shard%2F12510

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395265351.107174:@expires_in0

data/spec/dummy/tmp/cache/3AA/F10/shard%2F10027

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395249202.276902:@value":nil

data/spec/dummy/tmp/cache/3AA/F80/shard%2F13006

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395353374.976767:@expires_in0

data/spec/dummy/tmp/cache/3AA/FB0/shard%2F12223

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395259330.9373682:@expires_in0

data/spec/dummy/tmp/cache/3AA/FD0/shard%2F13132

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395356925.251668:@expires_in0

data/spec/dummy/tmp/cache/3AB/F70/shard%2F10073

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395247876.422563:@value":nil

data/spec/dummy/tmp/cache/3AB/F70/shard%2F10154

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395250828.909863:@value":nil

data/spec/dummy/tmp/cache/3AB/FC0/shard%2F13115

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395356903.01191:@expires_in0

data/spec/dummy/tmp/cache/3AC/050/shard%2F12702

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348876.576017:@value":nil

data/spec/dummy/tmp/cache/3AC/FB0/shard%2F13017

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395353401.3710551:@expires_in0

data/spec/dummy/tmp/cache/3AD/010/shard%2F12253

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395259554.234432:@expires_in0

data/spec/dummy/tmp/cache/3AD/020/shard%2F12262

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395259597.792585:@expires_in0

data/spec/dummy/tmp/cache/3AE/040/shard%2F12191

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395258112.406572:@expires_in0

data/spec/dummy/tmp/cache/3AF/060/shard%2F12525

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395265484.546037:@expires_in0

data/spec/dummy/tmp/cache/3AF/0B0/shard%2F12651

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348798.0567172:@value":nil

data/spec/dummy/tmp/cache/3B0/010/shard%2F12229

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395259361.571546:@expires_in0

data/spec/dummy/tmp/cache/3B0/080/shard%2F13183

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395766408.394197:@value":nil

data/spec/dummy/tmp/cache/3B0/0A0/shard%2F12634

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395347922.839416:@value":nil

data/spec/dummy/tmp/cache/3B1/070/shard%2F13166

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395678017.240988:@value":nil

data/spec/dummy/tmp/cache/3B1/090/shard%2F12536

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395344339.6799722:@value":nil

data/spec/dummy/tmp/cache/3B1/0C0/shard%2F12563

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395344990.876418:@expires_in0

data/spec/dummy/tmp/cache/3B1/0D0/shard%2F12491

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395264885.3503292:@expires_in0

data/spec/dummy/tmp/cache/3B1/0F0/shard%2F12833

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395351233.769553:@value":nil

data/spec/dummy/tmp/cache/3B2/000/shard%2F10179

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395251074.866422:@value":nil

data/spec/dummy/tmp/cache/3B2/060/shard%2F13149

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395356959.37007:@value":nil

data/spec/dummy/tmp/cache/3B2/140/shard%2F12870

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395351428.641105:@expires_in0

data/spec/dummy/tmp/cache/3B3/0A0/shard%2F13096

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395356588.327811:@value":nil

data/spec/dummy/tmp/cache/3B3/0F0/shard%2F12736

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348920.596425:@value":nil

data/spec/dummy/tmp/cache/3B4/090/shard%2F13079

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395356468.371645:@expires_in0

data/spec/dummy/tmp/cache/3B4/0A0/shard%2F12197

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395258204.732102:@expires_in0

data/spec/dummy/tmp/cache/3B4/0E0/shard%2F12719

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348900.906124:@value":nil

data/spec/dummy/tmp/cache/3B5/160/shard%2F12864

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395351418.146604:@expires_in0

data/spec/dummy/tmp/cache/3B6/150/shard%2F12685

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348853.369654:@value":nil

data/spec/dummy/tmp/cache/3B7/140/shard%2F12668

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1395348831.209704:@value":nil

data/spec/dummy/tmp/cache/3B9/150/shard%2F12499

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1395265096.122713:@expires_in0

data/spec/lib/active_record/association_spec.rb

@@ -25,7 +25,8 @@ module Switchman
       end
 
       it "should set shard value to parent for association scope" do
-        scope = @user1.appendages.scoped
+        scope = @user1.appendages
+        scope = ::Rails.version < '4' ? scope.scoped : scope.scope
         scope.shard_value.should == @user1
         scope.shard_source_value.should == :association
       end
@@ -39,9 +40,10 @@ module Switchman
 
       describe "transaction" do
         it "should activate the owner's shard and start the transaction on that shard" do
+          base_value = @user1.shard.activate { User.connection.open_transactions }
           @user1.appendages.transaction(:requires_new => true) do
             Shard.current.should == @shard1
-            User.connection.open_transactions.should == 2
+            User.connection.open_transactions.should == base_value + 1
           end
         end
       end
@@ -66,7 +68,11 @@ module Switchman
         d1 = a1.digits.create!
         d1.shard.should == @shard1
 
-        @user1.digits.scoped.shard_value.should == @user1
+        if ::Rails.version < '4'
+          @user1.digits.scoped.shard_value.should == @user1
+        else
+          @user1.digits.scope.shard_value.should == @user1
+        end
         @user1.digits.find(d1.id).should == d1
       end
 
@@ -99,9 +105,15 @@ module Switchman
       it "should properly set up a cross-shard-category query" do
         @shard1.activate(:mirror_universe) do
           mirror_user = MirrorUser.create!
-          relation = mirror_user.association(:user).scoped
+          relation = mirror_user.association(:user)
+          relation = ::Rails.version < '4' ? relation.scoped : relation.scope
           relation.shard_value.should == Shard.default
-          relation.where_values.first.right.should == mirror_user.global_id
+          if ::Rails.version < '4'
+            relation.where_values.first.right.should == mirror_user.global_id
+          else
+            relation.where_values.first.right.should be_a(Arel::Nodes::BindParam)
+            relation.bind_values.map(&:last).should == [mirror_user.global_id]
+          end
         end
       end
 
@@ -229,12 +241,10 @@ module Switchman
             user3 = User.create!
             user3.appendages.create!
 
-            appendages = Appendage.all(:include => :user)
-            appendages2 = Appendage.includes(:user).all
+            appendages = Appendage.includes(:user).to_a
             @user1.delete
 
             appendages.map(&:user).sort.should == [@user1, @user2, user3].sort
-            appendages2.map(&:user).sort.should == [@user1, @user2, user3].sort
           end
 
           it "should preload belongs_to :through associations across shards" do
@@ -244,7 +254,7 @@ module Switchman
             a2 = @shard1.activate {Appendage.create!(:user => @user2) }
             d2 = Digit.create!(:appendage => a2)
 
-            digits = Digit.includes(:user).all
+            digits = Digit.includes(:user).to_a
             @user1.delete
 
             digits.map(&:user).sort.should == [@user1, @user2].sort
@@ -258,7 +268,7 @@ module Switchman
             User.associated_shards_map = { @user1.global_id => [@shard1, @shard2] }
 
             begin
-              users = User.where(:id => [@user1, @user2]).includes(:appendages).all
+              users = User.where(:id => [@user1, @user2]).includes(:appendages).to_a
               users.each {|u| u.appendages.loaded?.should be_true}
 
               u1 = users.detect {|u| u.id == @user1.id}
@@ -294,7 +304,7 @@ module Switchman
             Appendage.associated_shards_map = { a2.global_id => [@shard1, @shard2], a6.global_id => [@shard1] }
 
             begin
-              users = User.where(:id => [@user1, @user2]).includes(:digits).all
+              users = User.where(:id => [@user1, @user2]).includes(:digits).to_a
               users.each {|u| u.digits.loaded?.should be_true}
 
               u1 = users.detect {|u| u.id == @user1.id}

data/spec/lib/active_record/finder_methods_spec.rb

@@ -43,7 +43,7 @@ module Switchman
 
         it "should work for a multi-shard scope" do
           user2 = @shard2.activate { User.create!(name: "multi-shard exists") }
-          User.where(name: "multi-shard exists").shard(Shard.scoped).exists?.should be_true
+          User.where(name: "multi-shard exists").shard(::Rails.version < '4' ? Shard.scoped : Shard.all).exists?.should be_true
         end
       end
     end

data/spec/lib/active_record/query_cache_spec.rb

@@ -52,7 +52,7 @@ module Switchman
         @shard3.activate do
           User.create!
         end
-        @shard1.activate { User.all }.should_not == @shard3.activate { User.all }
+        @shard1.activate { User.all.to_a }.should_not == @shard3.activate { User.all.to_a }
       end
 
       describe "query_cache_enabled" do
@@ -167,13 +167,13 @@ module Switchman
       describe "select_all" do
         it "should cache when query cache enabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.query_cache.should_not be_empty
         end
 
         it "should not cache when query cache disabled" do
           User.connection.disable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.query_cache.should be_empty
         end
 
@@ -181,12 +181,12 @@ module Switchman
           User.connection.disable_query_cache!
           threaded(
             lambda{ |cc| User.connection.cache{ cc.call } },
-            lambda{ User.all; User.connection.query_cache.should be_empty })
+            lambda{ User.all.to_a; User.connection.query_cache.should be_empty })
         end
 
         it "should not cache when query is locked" do
           User.connection.enable_query_cache!
-          User.lock.all
+          User.lock.to_a
           User.connection.query_cache.should be_empty
         end
       end
@@ -194,14 +194,14 @@ module Switchman
       describe "insert" do
         it "should clear thread's query cache if enabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.create!
           User.connection.query_cache.should be_empty
         end
 
         it "should not clear thread's query cache if disabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.disable_query_cache!
           User.create!
           User.connection.query_cache.should_not be_empty
@@ -209,7 +209,7 @@ module Switchman
 
         it "should not clear thread's query cache if disabled but other thread's enabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.disable_query_cache!
           threaded(
             lambda{ |cc| User.create!; cc.call },
@@ -218,7 +218,7 @@ module Switchman
 
         it "should not clear other thread's query cache" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.disable_query_cache!
           threaded(
             lambda{ |cc| User.create!; cc.call },
@@ -233,35 +233,45 @@ module Switchman
 
         it "should clear thread's query cache if enabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.update_all(updated_at: Time.now)
           User.connection.query_cache.should be_empty
         end
 
         it "should not clear thread's query cache if disabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.disable_query_cache!
           User.update_all(updated_at: Time.now)
           User.connection.query_cache.should_not be_empty
         end
 
-        it "should not clear thread's query cache if disabled but other thread's enabled" do
-          User.connection.enable_query_cache!
-          User.all
-          User.connection.disable_query_cache!
-          threaded(
-            lambda{ |cc| User.update_all(updated_at: Time.now); cc.call },
-            lambda{ User.connection.query_cache.should_not be_empty })
-        end
+        context "non-transactional" do
+          unless ::ActiveRecord::Base.connection_pool.spec.config[:adapter_name] == 'PostgreSQL'
+            self.use_transactional_fixtures = false
 
-        it "should not clear other thread's query cache" do
-          User.connection.enable_query_cache!
-          User.all
-          User.connection.disable_query_cache!
-          threaded(
-            lambda{ |cc| User.update_all(updated_at: Time.now); cc.call },
-            lambda{ User.connection.query_cache.should_not be_empty })
+            after do
+              User.delete_all
+            end
+          end
+
+          it "should not clear thread's query cache if disabled but other thread's enabled" do
+            User.connection.enable_query_cache!
+            User.all.to_a
+            User.connection.disable_query_cache!
+            threaded(
+              lambda{ |cc| User.update_all(updated_at: Time.now); cc.call },
+              lambda{ User.connection.query_cache.should_not be_empty })
+          end
+
+          it "should not clear other thread's query cache" do
+            User.connection.enable_query_cache!
+            User.all.to_a
+            User.connection.disable_query_cache!
+            threaded(
+              lambda{ |cc| User.update_all(updated_at: Time.now); cc.call },
+              lambda{ User.connection.query_cache.should_not be_empty })
+          end
         end
       end
 
@@ -272,35 +282,45 @@ module Switchman
 
         it "should clear thread's query cache if enabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.delete_all
           User.connection.query_cache.should be_empty
         end
 
         it "should not clear thread's query cache if disabled" do
           User.connection.enable_query_cache!
-          User.all
+          User.all.to_a
           User.connection.disable_query_cache!
           User.delete_all
           User.connection.query_cache.should_not be_empty
         end
 
-        it "should not clear thread's query cache if disabled but other thread's enabled" do
-          User.connection.enable_query_cache!
-          User.all
-          User.connection.disable_query_cache!
-          threaded(
-            lambda{ |cc| User.delete_all; cc.call },
-            lambda{ User.connection.query_cache.should_not be_empty })
-        end
+        context "non-transactional" do
+          unless ::ActiveRecord::Base.connection_pool.spec.config[:adapter_name] == 'PostgreSQL'
+            self.use_transactional_fixtures = false
 
-        it "should not clear other thread's query cache" do
-          User.connection.enable_query_cache!
-          User.all
-          User.connection.disable_query_cache!
-          threaded(
-            lambda{ |cc| User.delete_all; cc.call },
-            lambda{ User.connection.query_cache.should_not be_empty })
+            after do
+              User.delete_all
+            end
+          end
+
+          it "should not clear thread's query cache if disabled but other thread's enabled" do
+            User.connection.enable_query_cache!
+            User.all.to_a
+            User.connection.disable_query_cache!
+            threaded(
+              lambda{ |cc| User.delete_all; cc.call },
+              lambda{ User.connection.query_cache.should_not be_empty })
+          end
+
+          it "should not clear other thread's query cache" do
+            User.connection.enable_query_cache!
+            User.all.to_a
+            User.connection.disable_query_cache!
+            threaded(
+              lambda{ |cc| User.delete_all; cc.call },
+              lambda{ User.connection.query_cache.should_not be_empty })
+          end
         end
       end
     end

data/spec/lib/active_record/query_methods_spec.rb

@@ -31,22 +31,22 @@ module Switchman
         end
 
         it "should be the default shard if it's a scope of Shard" do
-          User.shard(Shard.scoped).primary_shard.should == Shard.default
+          User.shard(::Rails.version < '4' ? Shard.scoped : Shard.all).primary_shard.should == Shard.default
           @shard1.activate do
-            User.shard(Shard.scoped).primary_shard.should == Shard.default
+            User.shard(::Rails.version < '4' ? Shard.scoped : Shard.all).primary_shard.should == Shard.default
           end
         end
       end
 
       it "should default to the current shard" do
-        relation = User.scoped
+        relation = ::Rails.version < '4' ? User.scoped : User.all
         relation.shard_value.should == Shard.default
         relation.shard_source_value.should == :implicit
 
         @shard1.activate do
           relation.shard_value.should == Shard.default
 
-          relation = User.scoped
+          relation = ::Rails.version < '4' ? User.scoped : User.all
           relation.shard_value.should == @shard1
           relation.shard_source_value.should == :implicit
         end
@@ -145,7 +145,8 @@ module Switchman
           grandchild = child.children.create!
           child.reload.parent.should == @user1
 
-          relation = @user1.association(:grandchildren).scoped
+          relation = @user1.association(:grandchildren)
+          relation = ::Rails.version < '4' ? relation.scoped : relation.scope
 
           attribute = relation.where_values.first.left
           attribute.name.to_s.should == 'parent_id'

data/spec/lib/active_record/relation_spec.rb

@@ -16,7 +16,7 @@ module Switchman
         end
 
         it "should activate multiple shards if necessary" do
-          User.where(:id => [@user1.id, @user2.id]).all.sort_by(&:id).should == [@user1, @user2].sort_by(&:id)
+          User.where(:id => [@user1.id, @user2.id]).sort_by(&:id).should == [@user1, @user2].sort_by(&:id)
         end
       end
 

data/spec/lib/active_record/spawn_methods_spec.rb

@@ -20,20 +20,21 @@ module Switchman
         end
 
         it "should ignore implicit shard value lhs" do
-          result = User.scoped.merge(User.shard(@shard1))
+          scope = ::Rails.version < '4' ? User.scoped : User.all
+          result = scope.merge(User.shard(@shard1))
           result.shard_value.should == @shard1
           result.shard_source_value.should == :explicit
         end
 
         it "should ignore implicit shard value rhs" do
-          result = User.shard(@shard1).merge(User.scoped)
+          result = User.shard(@shard1).merge(::Rails.version < '4' ? User.scoped : User.all)
           result.shard_value.should == @shard1
           result.shard_source_value.should == :explicit
         end
 
         it "should take lhs shard_value for double implicit" do
-          scope1 = @shard2.activate { User.scoped }
-          result = scope1.merge(User.scoped)
+          scope1 = @shard2.activate { ::Rails.version < '4' ? User.scoped : User.all }
+          result = scope1.merge(::Rails.version < '4' ? User.scoped : User.all)
           result.shard_value.should == @shard2
           result.shard_source_value.should == :implicit
         end