active_record_shards 2.5.6 → 2.5.7

data/lib/active_record_shards/connection_switcher.rb

@@ -180,14 +180,10 @@ module ActiveRecordShards
     end
 
     def columns_with_default_shard
-      begin
+      if is_sharded? && current_shard_id.nil?
+        on_first_shard { columns_without_default_shard }
+      else
         columns_without_default_shard
-      rescue
-        if is_sharded? && (shard_name = shard_names.first)
-          on_shard(shard_name) { columns_without_default_shard }
-        else
-          raise
-        end
       end
     end
 

data/test/connection_switching_test.rb

@@ -136,6 +136,10 @@ class ConnectionSwitchenTest < ActiveSupport::TestCase
         end
       end
 
+      before_should "not try the unsharded connection" do
+        ActiveRecord::Base.connection.expects(:columns).never
+      end
+
       before_should "try the first shard" do
         shards = ActiveRecord::Base.configurations[RAILS_ENV]['shard_names'].dup