Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) (closes #2644) [Dan Peterson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 5 insertions, 5 deletions

diff --git a/activerecord/test/connections/native_sqlite/connection.rb b/activerecord/test/connections/native_sqlite/connection.rb
index b686c7705b..6a08fc1f8e 100644
--- a/activerecord/test/connections/native_sqlite/connection.rb
+++ b/activerecord/test/connections/native_sqlite/connection.rb
@@ -18,7 +18,7 @@ def make_connection(clazz, db_file, db_definitions_file)
     raise SqliteError.new("Seems that there is no sqlite executable available") unless system(sqlite_command)
     clazz.establish_connection(
         :adapter => "sqlite",
-        :dbfile  => db_file)
+        :database  => db_file)
     script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}")
     # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time
     script.split(';').each do
@@ -28,7 +28,7 @@ def make_connection(clazz, db_file, db_definitions_file)
   else
     clazz.establish_connection(
         :adapter => "sqlite",
-        :dbfile  => db_file)
+        :database  => db_file)
   end
 end
 
diff --git a/activerecord/test/connections/native_sqlite3/connection.rb b/activerecord/test/connections/native_sqlite3/connection.rb
index 07856cc677..917f7129da 100644
--- a/activerecord/test/connections/native_sqlite3/connection.rb
+++ b/activerecord/test/connections/native_sqlite3/connection.rb
@@ -18,7 +18,7 @@ def make_connection(clazz, db_file, db_definitions_file)
     raise SqliteError.new("Seems that there is no sqlite3 executable available") unless system(sqlite_command)
     clazz.establish_connection(
         :adapter => "sqlite3",
-        :dbfile  => db_file)
+        :database  => db_file)
     script = File.read("#{BASE_DIR}/db_definitions/#{db_definitions_file}")
     # SQLite-Ruby has problems with semi-colon separated commands, so split and execute one at a time
     script.split(';').each do
@@ -28,7 +28,7 @@ def make_connection(clazz, db_file, db_definitions_file)
   else
     clazz.establish_connection(
         :adapter => "sqlite3",
-        :dbfile  => db_file)
+        :database  => db_file)
   end
 end
 
diff --git a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
index d11a5fe8c8..9e0414ba88 100644
--- a/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
+++ b/activerecord/test/connections/native_sqlite3/in_memory_connection.rb
@@ -7,7 +7,7 @@ class SqliteError < StandardError
 end
 
 def make_connection(clazz, db_definitions_file)
-  clazz.establish_connection(:adapter => 'sqlite3', :dbfile  => ':memory:')
+  clazz.establish_connection(:adapter => 'sqlite3', :database  => ':memory:')
   File.read("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/#{db_definitions_file}").split(';').each do |command|
     clazz.connection.execute(command) unless command.strip.empty?
   end