Fix merge issues with RailsSequels rename

pull/11735/head
Javier Torres 8 years ago
parent 85a2ebf8d6
commit 951a05c831

@ -382,6 +382,6 @@ class UserTable < Sequel::Model
end
def relator
@relator ||= CartoDB::TableRelator.new(Rails::Sequel.connection, self)
@relator ||= CartoDB::TableRelator.new(SequelRails.connection, self)
end
end

@ -551,7 +551,7 @@ describe Table do
table = create_table(name: 'Wadus table', user_id: @user.id)
Rails::Sequel.connection.table_exists?(table.name.to_sym).should be_false
SequelRails.connection.table_exists?(table.name.to_sym).should be_false
@user.in_database do |user_database|
user_database.table_exists?(table.name.to_sym).should be_true
end
@ -582,7 +582,7 @@ describe Table do
table = create_table({:name => 'Wadus table', :user_id => @user.id})
table.name.should == 'wadus_table'
Rails::Sequel.connection.table_exists?(table.name.to_sym).should be_false
SequelRails.connection.table_exists?(table.name.to_sym).should be_false
@user.in_database do |user_database|
user_database.table_exists?(table.name.to_sym).should be_true
end

@ -67,7 +67,7 @@ class CustomPlan < Zeus::Rails
end
def rake
Rails::Sequel.connection.disconnect
SequelRails.connection.disconnect
super
end
end

Loading…
Cancel
Save