Skip to content

Commit 37be69c

Browse files
committed
Replace connection with lease_connection
1 parent d7d82bf commit 37be69c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

lib/active_record/tasks/sqlserver_database_tasks.rb

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Tasks
1010
class SQLServerDatabaseTasks
1111
DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS"
1212

13-
delegate :connection, :establish_connection, to: ActiveRecord::Base
13+
delegate :lease_connection, :establish_connection, to: ActiveRecord::Base
1414

1515
def self.using_database_configurations?
1616
true
@@ -23,7 +23,7 @@ def initialize(configuration)
2323

2424
def create(master_established = false)
2525
establish_master_connection unless master_established
26-
connection.create_database configuration.database, configuration_hash.merge(collation: default_collation)
26+
lease_connection.create_database configuration.database, configuration_hash.merge(collation: default_collation)
2727
establish_connection configuration
2828
rescue ActiveRecord::StatementInvalid => e
2929
if /database .* already exists/i === e.message
@@ -35,15 +35,15 @@ def create(master_established = false)
3535

3636
def drop
3737
establish_master_connection
38-
connection.drop_database configuration.database
38+
lease_connection.drop_database configuration.database
3939
end
4040

4141
def charset
42-
connection.charset
42+
lease_connection.charset
4343
end
4444

4545
def collation
46-
connection.collation
46+
lease_connection.collation
4747
end
4848

4949
def purge
@@ -67,9 +67,9 @@ def structure_dump(filename, extra_flags)
6767
"-P #{Shellwords.escape(configuration_hash[:password])}",
6868
"-o #{Shellwords.escape(filename)}",
6969
]
70-
table_args = connection.tables.map { |t| Shellwords.escape(t) }
70+
table_args = lease_connection.tables.map { |t| Shellwords.escape(t) }
7171
command.concat(table_args)
72-
view_args = connection.views.map { |v| Shellwords.escape(v) }
72+
view_args = lease_connection.views.map { |v| Shellwords.escape(v) }
7373
command.concat(view_args)
7474
raise "Error dumping database" unless Kernel.system(command.join(" "))
7575

@@ -83,7 +83,7 @@ def structure_dump(filename, extra_flags)
8383
end
8484

8585
def structure_load(filename, extra_flags)
86-
connection.execute File.read(filename)
86+
lease_connection.execute File.read(filename)
8787
end
8888

8989
private

0 commit comments

Comments
 (0)