diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-03 13:12:51 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-03 13:12:51 -0300 |
| commit | 62296a51c80b93fedcae896a534862687c8fef94 (patch) | |
| tree | c6add8aa3802855b55ae3a45edfb2b1e20ea668d /activerecord/lib/active_record/connection_adapters | |
| parent | 3de59e916d6a3d4eab202cf0c99b1f88905a3b43 (diff) | |
| parent | 9b68877897a44d4484cde40117abc42c9b029154 (diff) | |
| download | rails-62296a51c80b93fedcae896a534862687c8fef94.tar.gz rails-62296a51c80b93fedcae896a534862687c8fef94.tar.bz2 rails-62296a51c80b93fedcae896a534862687c8fef94.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 16a976a8c7..e939701d63 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -27,7 +27,6 @@ module ActiveRecord private def parse_sqlite_config!(config) - config[:database] ||= config[:dbfile] # Require database. unless config[:database] raise ArgumentError, "No database file specified. Missing argument: database" |