Merge pull request #127 from zendesk/bquorning/separate-schemas-for-separate-databases

Tests: Use separate schemas for sharded and unsharded

Author: bquorning

test/connection_switching_test.rb

@@ -617,16 +617,27 @@ class ShardedModel < ActiveRecord::Base
         end
 
         it "supports implicit joins" do
-          accounts = Account.includes(:tickets)
-          accounts = accounts.references(:tickets) if ActiveRecord::VERSION::MAJOR >= 4
-          assert_equal ["slave_name", "slave_name2"], accounts.order('tickets.id').map(&:name).sort
+          accounts = Account.includes(:account_things)
+          accounts = accounts.references(:account_things) if ActiveRecord::VERSION::MAJOR >= 4
+          assert_equal ["slave_name", "slave_name2"], accounts.order('account_things.id').map(&:name).sort
         end
 
         it "supports joins" do
-          accounts = Account.joins('LEFT OUTER JOIN tickets ON tickets.account_id = accounts.id').map(&:name).sort
+          accounts = Account.joins('LEFT OUTER JOIN account_things ON account_things.account_id = accounts.id').map(&:name).sort
           assert_equal ["slave_name", "slave_name2"], accounts
         end
 
+        it "does not support implicit joins between an unsharded and a sharded table" do
+          accounts = Account.includes(:tickets).order('tickets.id')
+          accounts = accounts.references(:tickets) if ActiveRecord::VERSION::MAJOR >= 4
+          assert_raises(ActiveRecord::StatementInvalid) { accounts.first }
+        end
+
+        it "does not support explicit joins between an unsharded and a sharded table" do
+          accounts = Account.joins('LEFT OUTER JOIN tickets ON tickets.account_id = accounts.id')
+          assert_raises(ActiveRecord::StatementInvalid) { accounts.first }
+        end
+
         after do
           Account.on_slave_by_default = false
           Person.on_slave_by_default = false
@@ -643,10 +654,10 @@ class ShardedModel < ActiveRecord::Base
       end
 
       it "work on association collections" do
-        begin
-          assert_using_master_db
-          account = Account.create!
+        assert_using_master_db
+        account = Account.create!
 
+        ActiveRecord::Base.on_shard(0) do
           account.tickets.create! title: 'master ticket'
 
           Ticket.on_slave do
@@ -655,11 +666,6 @@ class ShardedModel < ActiveRecord::Base
 
           assert_equal "master ticket", account.tickets.first.title
           assert_equal "slave ticket", account.tickets.on_slave.first.title
-        rescue StandardError
-          retried ||= 0
-          retried += 1
-          puts "Failed in #{__LINE__}##{retried}"
-          retry if retried < 3
         end
       end
     end

test/helper.rb

@@ -31,8 +31,6 @@ def connection_exist_method
 
 BaseMigration = (ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration) # rubocop:disable Style/ConstantName
 
-Phenix.configure
-
 require 'active_support/test_case'
 
 # support multiple before/after blocks per example
@@ -96,7 +94,25 @@ def table_has_column?(table, column)
   def self.with_phenix
     before do
       ActiveRecord::Base.stubs(:with_default_shard).yields
+
+      # Populate unsharded databases
+      Phenix.configure do |config|
+        config.schema_path = File.join(Dir.pwd, 'test', 'unsharded_schema.rb')
+        config.skip_database = lambda do |name, _|
+          %w[test_shard_0 test_shard_0_slave test_shard_1 test_shard_1_slave].include?(name)
+        end
+      end
       Phenix.rise!(with_schema: true)
+
+      # Populate sharded databases
+      Phenix.configure do |config|
+        config.schema_path = File.join(Dir.pwd, 'test', 'sharded_schema.rb')
+        config.skip_database = lambda do |name, _|
+          %w[test test_slave test2 test2_slave].include?(name)
+        end
+      end
+      Phenix.rise!(with_schema: true)
+
       ActiveRecord::Base.unstub(:with_default_shard)
     end
 

test/migrator_test.rb

@@ -4,23 +4,27 @@
 describe ActiveRecord::Migrator do
   with_phenix
 
+  before { ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) }
+
   it "migrates" do
     migration_path = File.join(File.dirname(__FILE__), "/migrations")
+
+    refute ActiveRecord::Base.current_shard_id
     ActiveRecord::Migrator.migrate(migration_path)
+
     ActiveRecord::Base.on_all_shards do
       assert ActiveRecord::Base.connection.public_send(connection_exist_method, :schema_migrations), "Schema Migrations doesn't exist"
-      assert ActiveRecord::Base.connection.public_send(connection_exist_method, :accounts)
+      assert ActiveRecord::Base.connection.public_send(connection_exist_method, :tickets)
+      refute ActiveRecord::Base.connection.public_send(connection_exist_method, :accounts)
       assert ActiveRecord::Base.connection.select_value("select version from schema_migrations where version = '20110824010216'")
       assert ActiveRecord::Base.connection.select_value("select version from schema_migrations where version = '20110829215912'")
     end
 
     ActiveRecord::Base.on_all_shards do
       assert table_has_column?("tickets", "sharded_column")
-      assert !table_has_column?("accounts", "non_sharded_column")
     end
 
     ActiveRecord::Base.on_shard(nil) do
-      assert !table_has_column?("tickets", "sharded_column")
       assert table_has_column?("accounts", "non_sharded_column")
     end
 

test/schema_dumper_extension_test.rb

@@ -9,6 +9,8 @@
       with_phenix
 
       before do
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+
         # create shard-specific columns
         ActiveRecord::Migrator.migrations_paths = [File.join(File.dirname(__FILE__), "/migrations")]
         ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)
@@ -25,18 +27,15 @@
 
         ActiveRecord::Base.on_all_shards do
           assert ActiveRecord::Base.connection.public_send(connection_exist_method, :schema_migrations), "Schema Migrations doesn't exist"
-          assert ActiveRecord::Base.connection.public_send(connection_exist_method, :accounts)
           assert ActiveRecord::Base.connection.select_value("select version from schema_migrations where version = '20110824010216'")
           assert ActiveRecord::Base.connection.select_value("select version from schema_migrations where version = '20110829215912'")
         end
 
         ActiveRecord::Base.on_all_shards do
           assert table_has_column?("tickets", "sharded_column")
-          assert !table_has_column?("accounts", "non_sharded_column")
         end
 
         ActiveRecord::Base.on_shard(nil) do
-          assert !table_has_column?("tickets", "sharded_column")
           assert table_has_column?("accounts", "non_sharded_column")
         end
       end

test/sharded_schema.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Schema.define(version: 1) do
+  create_table "tickets", force: true do |t|
+    t.string   "title"
+    t.integer  "account_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+end

test/schema.rb renamed to test/unsharded_schema.rb

@@ -18,13 +18,6 @@
     t.integer "person_id"
   end
 
-  create_table "tickets", force: true do |t|
-    t.string   "title"
-    t.integer  "account_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "people", force: true do |t|
     t.string "name"
     t.string "type"