Skip to content

Commit 30fdabc

Browse files
committed
fix
1 parent dee7b57 commit 30fdabc

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Diff for: spec/spec_helper.rb

-5
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ def sqlite?
9999
# Require our gem
100100
require 'closure_tree'
101101

102-
ActiveRecord::Tasks::DatabaseTasks.drop_current(:primary)
103-
ActiveRecord::Tasks::DatabaseTasks.create_current(:primary)
104-
ActiveRecord::Tasks::DatabaseTasks.drop_current(:secondary)
105-
ActiveRecord::Tasks::DatabaseTasks.create_current(:secondary)
106-
107102
# Load test helpers
108103
require_relative 'support/schema'
109104
require_relative 'support/models'

Diff for: spec/support/schema.rb

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
4+
35
class ApplicationRecord < ActiveRecord::Base
46
self.abstract_class = true
57

@@ -12,6 +14,12 @@ class SecondDatabaseRecord < ActiveRecord::Base
1214
connects_to database: { writing: :secondary, reading: :secondary }
1315
end
1416

17+
ActiveRecord::Tasks::DatabaseTasks.drop(:primary)
18+
ActiveRecord::Tasks::DatabaseTasks.create(:primary)
19+
ActiveRecord::Tasks::DatabaseTasks.drop(:secondary)
20+
ActiveRecord::Tasks::DatabaseTasks.create(:secondary)
21+
22+
ApplicationRecord.establish_connection
1523
ActiveRecord::Schema.define(version: 0) do
1624
connection.create_table 'tags', force: :cascade do |t|
1725
t.string 'name'

Diff for: test/test_helper.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ class Spec
6767
Thread.abort_on_exception = true
6868

6969
require 'closure_tree'
70-
ActiveRecord::Tasks::DatabaseTasks.drop_current(:primary)
71-
ActiveRecord::Tasks::DatabaseTasks.create_current(:primary)
72-
ActiveRecord::Tasks::DatabaseTasks.drop_current(:secondary)
73-
ActiveRecord::Tasks::DatabaseTasks.create_current(:secondary)
70+
7471

7572
require_relative '../spec/support/schema'
7673
require_relative '../spec/support/models'

0 commit comments

Comments
 (0)