Use adapter_class
instead of connection_class
for adapters
In Active Record `connection_class` already means "the class in your application that established the connection" so I would prefer it only have that one meaning. This change swaps `connection_class` for `adapter_class` where applicable.
This commit is contained in:
parent
a4eeb2bcd4
commit
5bb357f14a
@ -8,13 +8,13 @@
|
||||
|
||||
module ActiveRecord
|
||||
module ConnectionHandling # :nodoc:
|
||||
def mysql2_connection_class
|
||||
def mysql2_adapter_class
|
||||
ConnectionAdapters::Mysql2Adapter
|
||||
end
|
||||
|
||||
# Establishes a connection to the database that's used by all Active Record objects.
|
||||
def mysql2_connection(config)
|
||||
mysql2_connection_class.new(config)
|
||||
mysql2_adapter_class.new(config)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -21,13 +21,13 @@
|
||||
|
||||
module ActiveRecord
|
||||
module ConnectionHandling # :nodoc:
|
||||
def postgresql_connection_class
|
||||
def postgresql_adapter_class
|
||||
ConnectionAdapters::PostgreSQLAdapter
|
||||
end
|
||||
|
||||
# Establishes a connection to the database that's used by all Active Record objects
|
||||
def postgresql_connection(config)
|
||||
postgresql_connection_class.new(config)
|
||||
postgresql_adapter_class.new(config)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -15,12 +15,12 @@
|
||||
|
||||
module ActiveRecord
|
||||
module ConnectionHandling # :nodoc:
|
||||
def sqlite3_connection_class
|
||||
def sqlite3_adapter_class
|
||||
ConnectionAdapters::SQLite3Adapter
|
||||
end
|
||||
|
||||
def sqlite3_connection(config)
|
||||
sqlite3_connection_class.new(config)
|
||||
sqlite3_adapter_class.new(config)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -18,7 +18,7 @@ def adapter_method
|
||||
end
|
||||
|
||||
def adapter_class_method
|
||||
"#{adapter}_connection_class"
|
||||
"#{adapter}_adapter_class"
|
||||
end
|
||||
|
||||
def host
|
||||
|
@ -16,7 +16,7 @@ def initialize(options = {})
|
||||
end
|
||||
|
||||
def start
|
||||
connection_class.dbconsole(db_config, @options)
|
||||
adapter_class.dbconsole(db_config, @options)
|
||||
rescue NotImplementedError
|
||||
abort "Unknown command-line client for #{db_config.database}."
|
||||
end
|
||||
@ -50,7 +50,7 @@ def environment
|
||||
end
|
||||
|
||||
private
|
||||
def connection_class
|
||||
def adapter_class
|
||||
if ActiveRecord::Base.respond_to?(db_config.adapter_class_method)
|
||||
ActiveRecord::Base.public_send(db_config.adapter_class_method)
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user