aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-04-17 12:10:20 -0400
committerArthur Neves <arthurnn@gmail.com>2014-04-17 12:10:20 -0400
commit4db2e1f78044b7f39119daa9589cc6b8ae48f726 (patch)
tree4d0d04989d4621a5e253b8dd1c452a09b1bf4eec /activerecord
parent542457b5d2f56baafd60a0e46f1bfb9eb481e61b (diff)
downloadrails-4db2e1f78044b7f39119daa9589cc6b8ae48f726.tar.gz
rails-4db2e1f78044b7f39119daa9589cc6b8ae48f726.tar.bz2
rails-4db2e1f78044b7f39119daa9589cc6b8ae48f726.zip
Bring SQLite3Adpter init API closer to others
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb1
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 20eea208ec..d2ef83b047 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -187,7 +187,6 @@ module ActiveRecord
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
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index cd1f7a16c6..2d5c47967d 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -30,7 +30,7 @@ module ActiveRecord
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 @@ module ActiveRecord
include Arel::Visitors::BindVisitor
end
- def initialize(connection, logger, config)
+ def initialize(connection, logger, connection_options, config)
super(connection, logger)
@active = nil