switchman 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc2dfd339cd0bc006a3a5201bee157d982f3294a
-  data.tar.gz: 122345b29537d27f0b0dd5808b4f2881af26fa9d
+  metadata.gz: 24a9d501ff39800e2fbc3c7bcdd58b1ed78a59fc
+  data.tar.gz: bd0d9bb1b19dc0ea14b5f79f44a16925283e761a
 SHA512:
-  metadata.gz: c59075ed736d45ecf0aabfc3f7e69eab51d7920d07a423b5acd5241cdb0bbbe42b78709a6e94032d17b7aa557535f0f717a56293a7a49d927e0db9a6bf970e04
-  data.tar.gz: 334d1fa1b0e4d1fc65aef700842597403627bfd1e6196e4987c4516ae9608637a74afbb5ded7a6e4db7c8cccd41abf9b82af91076d1de9932783263b70309f43
+  metadata.gz: bd6f9f98050e479013de4f449d9c1f77fe2a851c3bcec9b40701d52c6b2457e4bc3a36df12a97c1e7f9fd2f5597df11ef360233cf7403fe1aa3e6a70b7c77477
+  data.tar.gz: e4df60dc747f88ea8908395d01685d4a9b7a43417e4d8c915d2ae38f94b5a88a465d4ab741d242c67f0fd33778aec11cf8d698eab6dfd2c67513e95d5296f9b0

data/app/models/switchman/shard.rb

@@ -41,7 +41,7 @@ module Switchman
           active_shards.clear
 
           # Now find the actual record, if it exists; rescue the fake default if the table doesn't exist
-          @default = Shard.find_by_default(true) || default rescue default
+          @default = Shard.where(default:true).first || default rescue default
         end
         @default
       end
@@ -122,7 +122,7 @@ module Switchman
       #    :exception - :ignore, :raise, :defer (wait until the end and raise the first
       #                error), or a proc
       def with_each_shard(*args)
-        raise ArgumentError("wrong number of arguments (#{args.length} for 0...3)") if args.length > 3
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 0...3)" if args.length > 3
 
         unless default.is_a?(Shard)
           return Array(yield)

data/lib/switchman/active_record/connection_handler.rb

@@ -4,14 +4,18 @@ require_dependency 'switchman/shard'
 module Switchman
   module ActiveRecord
     module ConnectionHandler
-      def self.make_sharing_automagic(config, shard)
+      def self.make_sharing_automagic(config)
         key = config[:adapter] == 'postgresql' ? :schema_search_path : :database
 
-        # we may not be able to connect to this shard yet, cause it might be an empty database server
-        shard_name = shard.name rescue nil
-        return unless shard_name
+        # only load the shard name from the db if we have to
+        if config[key] || !config[:shard_name]
+          # we may not be able to connect to this shard yet, cause it might be an empty database server
+          shard_name = Shard.current.name rescue nil
+          return unless shard_name
+
+          config[:shard_name] ||= shard_name
+        end
 
-        config[:shard_name] ||= shard_name
         if !config[key] || config[key] == shard_name
           # this may truncate the schema_search_path if it was not specified in database.yml
           # but that's what our old behavior was anyway, so I guess it's okay
@@ -53,10 +57,12 @@ module Switchman
           Shard.default
 
           # automatically change config to allow for sharing connections with simple config
-          ConnectionHandler.make_sharing_automagic(spec.config, Shard.default)
-          ConnectionHandler.make_sharing_automagic(Shard.default.database_server.config, Shard.default)
+          ConnectionHandler.make_sharing_automagic(spec.config)
+          ConnectionHandler.make_sharing_automagic(Shard.default.database_server.config)
+
+          ::ActiveRecord::Base.configurations[::Rails.env] = spec.config.stringify_keys
         end
-        @shard_connection_pools ||= { Shard.default.database_server.id => pool }
+        @shard_connection_pools ||= { [:master, Shard.default.database_server.shareable? ? ::Rails.env : Shard.default] => pool}
 
         proxy = ConnectionPoolProxy.new(model.shard_category,
                                         pool,
@@ -101,7 +107,10 @@ module Switchman
               next if server == Shard.default.database_server
               shard = server.shards.where(:name => nil).first
               shard ||= Shard.new(:database_server => server)
-              ConnectionHandler.make_sharing_automagic(server.config, shard)
+              shard.activate do
+                ConnectionHandler.make_sharing_automagic(server.config)
+                ConnectionHandler.make_sharing_automagic(proxy.current_pool.spec.config)
+              end
             end
           end
           # we may have established some connections above trying to infer the shard's name.

data/lib/switchman/active_record/connection_pool.rb

@@ -24,6 +24,9 @@ module Switchman
       def checkout_new_connection_with_sharding
         # TODO: this might be a threading issue
         spec.config[:shard_name] = self.shard.name
+        if self.shard.database_server.id == ::Rails.env
+          ::ActiveRecord::Base.configurations[::Rails.env] = spec.config.stringify_keys
+        end
 
         conn = checkout_new_connection_without_sharding
         conn.shard = self.shard

data/lib/switchman/active_record/query_cache.rb

@@ -51,6 +51,7 @@ module Switchman
 
       def select_all(arel, name = nil, binds = [])
         if self.query_cache_enabled && !locked?(arel)
+          arel, binds = binds_from_relation(arel, binds) unless ::Rails.version < '4'
           sql = to_sql(arel, binds)
           cache_sql(sql, binds) { super(sql, name, binds) }
         else
@@ -83,7 +84,11 @@ module Switchman
               query_cache[sql][binds] = yield
             end
 
-        result.collect { |row| row.dup }
+        if ::ActiveRecord::Result === result
+          result.dup
+        else
+          result.collect { |row| row.dup }
+        end
       end
 
       def self.included(base)

data/lib/switchman/active_record/query_methods.rb

@@ -93,7 +93,7 @@ module Switchman
         when ::ActiveRecord::Relation
           Shard.default
         else
-          raise ArgumentError("invalid shard value #{shard_value}")
+          raise ArgumentError, "invalid shard value #{shard_value}"
         end
       end
 

data/lib/switchman/connection_pool_proxy.rb

@@ -32,7 +32,7 @@ module Switchman
     end
 
     def current_pool
-      pool = self.default_pool if active_shard.database_server == Shard.default.database_server && active_shackles_environment == :master && active_shard.database_server.shareable?
+      pool = self.default_pool if active_shard.database_server == Shard.default.database_server && active_shackles_environment == :master && (active_shard == Shard.default || active_shard.database_server.shareable?)
       pool = @connection_pools[pool_key] ||= create_pool unless pool
       pool.shard = active_shard
       pool

data/lib/switchman/r_spec_helper.rb

@@ -13,73 +13,88 @@ module Switchman
     @@keep_the_shards = false
     @@shard1 = nil
 
+    def self.included_in?(klass)
+      klass.parent_groups.any? { |group| group.included_modules.include?(self) }
+    end
+
     def self.included(klass)
       # our before handlers have already been configured from a parent group; don't add them again
-      return if klass.parent_groups[1..-1].any? { |group| group.included_modules.include?(self) }
+      parent_group = klass.parent_groups[1]
+      return if parent_group && included_in?(parent_group)
 
-      klass.before(:all) do
-        unless @@shard1
-          puts "Setting up sharding for all specs..."
-          Shard.delete_all
+      # set up sharding schemas/dbs before the root group runs, so that
+      # they persist across transactional groups (e.g. once-ler)
+      root_group = klass.parent_groups.last
+      root_group.prepend_before(:all) do |group|
+        next if @@shard1
+        # if we aren't actually going to run a sharding group/example,
+        # don't set it up after all
+        groups = group.class.descendant_filtered_examples.map(&:example_group).uniq
+        next unless groups.any?{ |group| RSpecHelper.included_in?(group) }
 
-          @@shard1, @@shard2 = TestHelper.recreate_persistent_test_shards
-          @@default_shard = Shard.default
-          if @@shard1.is_a?(Shard)
-            @@keep_the_shards = true
-            @@shard3 = nil
-          else # @@shard1.is_a?(DatabaseServer)
-            begin
-              @@shard1 = @@shard1.create_new_shard
-              @@shard2 = @@shard2.create_new_shard
-              if @@shard1.database_server == Shard.default.database_server
-                @@shard3 = nil
-              else
-                @@shard3 = @@shard1.database_server.create_new_shard
-              end
-            rescue
-              @@shard1 = @@shard2 = @@shard3 = nil
-              raise
+        puts "Setting up sharding for all specs..."
+        Shard.delete_all
+
+        @@shard1, @@shard2 = TestHelper.recreate_persistent_test_shards
+        @@default_shard = Shard.default
+        if @@shard1.is_a?(Shard)
+          @@keep_the_shards = true
+          @@shard3 = nil
+        else # @@shard1.is_a?(DatabaseServer)
+          begin
+            @@shard1 = @@shard1.create_new_shard
+            @@shard2 = @@shard2.create_new_shard
+            if @@shard1.database_server == Shard.default.database_server
+              @@shard3 = nil
+            else
+              @@shard3 = @@shard1.database_server.create_new_shard
             end
+          rescue
+            @@shard1 = @@shard2 = @@shard3 = nil
+            raise
           end
-          puts "Done!"
+        end
+        # we'll re-persist in the group's `before :all`; we don't want them to exist
+        # in the db before then
+        Shard.delete_all
+        Shard.default(true)
+        puts "Done!"
 
-          at_exit do
-            # preserve rspec's exit status
-            status= $!.is_a?(::SystemExit) ? $!.status : nil
-            puts "Tearing down sharding for all specs"
-            @@shard1.database_server.destroy unless @@shard1.database_server == Shard.default.database_server
-            unless @@keep_the_shards
-              @@shard1.drop_database
-              @@shard1.destroy
-              @@shard2.drop_database
-              @@shard2.destroy
-              if @@shard3
-                @@shard3.drop_database
-                @@shard3.destroy
-              end
+        at_exit do
+          # preserve rspec's exit status
+          status= $!.is_a?(::SystemExit) ? $!.status : nil
+          puts "Tearing down sharding for all specs"
+          @@shard1.database_server.destroy unless @@shard1.database_server == Shard.default.database_server
+          unless @@keep_the_shards
+            @@shard1.drop_database
+            @@shard1.destroy
+            @@shard2.drop_database
+            @@shard2.destroy
+            if @@shard3
+              @@shard3.drop_database
+              @@shard3.destroy
             end
-            @@shard2.database_server.destroy
-            exit status if status
           end
-        else
-          dup = @@default_shard.dup
-          dup.id = @@default_shard.id
-          dup.save!
-          Shard.default(true)
-          dup = @@shard1.dup
-          dup.id = @@shard1.id
-          dup.save!
-          @@shard1.instance_variable_set(:@destroyed, false)
-          dup = @@shard2.dup
-          dup.id = @@shard2.id
+          @@shard2.database_server.destroy
+          exit status if status
+        end
+      end
+
+      klass.before(:all) do
+        dup = @@default_shard.dup
+        dup.id = @@default_shard.id
+        dup.save!
+        Shard.default(true)
+        dup = @@shard1.dup
+        dup.id = @@shard1.id
+        dup.save!
+        dup = @@shard2.dup
+        dup.id = @@shard2.id
+        dup.save!
+        if @@shard3
+          dup = @@shard3.dup
+          dup.id = @@shard3.id
           dup.save!
-          @@shard2.instance_variable_set(:@destroyed, false)
-          if @@shard3
-            dup = @@shard3.dup
-            dup.id = @@shard3.id
-            dup.save!
-            @@shard3.instance_variable_set(:@destroyed, false)
-          end
         end
         @shard1, @shard2 = @@shard1, @@shard2
         @shard3 = @@shard3 ? @@shard3 : Shard.default
@@ -137,10 +152,7 @@ module Switchman
       end
 
       klass.after(:all) do
-        Shard.default.destroy
-        @@shard1.destroy
-        @@shard2.destroy
-        @@shard3.destroy if @@shard3
+        Shard.delete_all
         Shard.default(true)
       end
     end

data/lib/switchman/test_helper.rb

@@ -1,14 +1,14 @@
 module Switchman
   module TestHelper
     class << self
-      def recreate_persistent_test_shards
+      def recreate_persistent_test_shards(options = {})
         # recreate the default shard (it got buhleted)
         if Shard.default(true).is_a?(DefaultShard)
           begin
             Shard.create!(default: true)
           rescue
             # database doesn't exist yet, presumably cause we're creating it right now
-            [nil, nil]
+            return [nil, nil]
           end
           Shard.default(true)
         end
@@ -37,6 +37,12 @@ module Switchman
 
           recreate_shards = shard1.activate { ::ActiveRecord::Base.connection.tables == [] }
           if recreate_shards
+            if options[:dont_create]
+              shard1.destroy
+              shard2.destroy
+              return [nil, nil]
+            end
+
             shard1.drop_database rescue nil
             shard1.destroy
             shard2.drop_database rescue nil

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.10"
+  VERSION = "1.2.11"
 end

data/lib/tasks/switchman.rake

@@ -5,6 +5,11 @@ module Switchman
     old_task.actions.clear
 
     old_task.enhance do
+      if ::Rails.env.test?
+        require 'switchman/test_helper'
+        TestHelper.recreate_persistent_test_shards(dont_create: true)
+      end
+
       ::Shackles.activate(:deploy) do
 
         scope = Shard.order("database_server_id IS NOT NULL, database_server_id, id")

data/spec/dummy/config/database.yml

@@ -11,10 +11,8 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  adapter: postgresql
+  database: switchman_test
 
 production:
   adapter: sqlite3

data/spec/dummy/config/environments/development.rb

@@ -16,10 +16,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/test.rb

@@ -24,5 +24,5 @@ Dummy::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
-  config.eager_load = false
+  config.eager_load = true
 end

data/spec/dummy/db/schema.rb

@@ -19,35 +19,35 @@ ActiveRecord::Schema.define(version: 20140219183820) do
   create_table "appendages", force: true do |t|
     t.integer  "user_id",    limit: 8
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "digits", force: true do |t|
     t.integer  "appendage_id", limit: 8
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "features", force: true do |t|
     t.integer  "owner_id",   limit: 8
     t.string   "owner_type"
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "mirror_users", force: true do |t|
     t.integer  "user_id",    limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "roots", force: true do |t|
     t.integer  "user_id",    limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "switchman_shards", force: true do |t|
@@ -59,8 +59,8 @@ ActiveRecord::Schema.define(version: 20140219183820) do
   create_table "users", force: true do |t|
     t.string   "name"
     t.integer  "mirror_user_id", limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
     t.integer  "parent_id",      limit: 8
   end