diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-30 08:10:04 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-30 08:10:04 +0000 |
| commit | c21fdf31a52cbe507ff675815c29e5eef39e0bbb (patch) | |
| tree | e782c60828c1632273e04aacfb197805c74b4b44 /activerecord/test/connections/native_sqlite | |
| parent | ea44527afd55b568be3a07cb0d4991242474db03 (diff) | |
| download | rails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.tar.gz rails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.tar.bz2 rails-c21fdf31a52cbe507ff675815c29e5eef39e0bbb.zip | |
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
Diffstat (limited to 'activerecord/test/connections/native_sqlite')
| -rw-r--r-- | activerecord/test/connections/native_sqlite/connection.rb | 4 |
1 files changed, 2 insertions, 2 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 |