Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #14788 from arthurnn/conn_adpt_api

Bring SQLite3Adpter init API closer to others
  • Loading branch information...
commit 27a0a4b69b873a9d36f23fb734fc89f564b63a8d 2 parents 542457b + 4db2e1f
@rafaelfranca rafaelfranca authored
View
1  activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -187,7 +187,6 @@ class BindSubstitution < Arel::Visitors::MySQL # :nodoc:
include Arel::Visitors::BindVisitor
end
- # FIXME: Make the first parameter more similar for the two adapters
def initialize(connection, logger, connection_options, config)
super(connection, logger)
@connection_options, @config = connection_options, config
View
4 activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -30,7 +30,7 @@ def sqlite3_connection(config)
db.busy_timeout(ConnectionAdapters::SQLite3Adapter.type_cast_config_to_integer(config[:timeout])) if config[:timeout]
- ConnectionAdapters::SQLite3Adapter.new(db, logger, config)
+ ConnectionAdapters::SQLite3Adapter.new(db, logger, nil, config)
rescue Errno::ENOENT => error
if error.message.include?("No such file or directory")
raise ActiveRecord::NoDatabaseError.new(error.message, error)
@@ -127,7 +127,7 @@ class BindSubstitution < Arel::Visitors::SQLite # :nodoc:
include Arel::Visitors::BindVisitor
end
- def initialize(connection, logger, config)
+ def initialize(connection, logger, connection_options, config)
super(connection, logger)
@active = nil
Please sign in to comment.
Something went wrong with that request. Please try again.