diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
| commit | dac8927b0576bff89ba3a4fcbf502dffc9b39e89 (patch) | |
| tree | 58c25132a52ef5cc56f406f8e2df416c5f2776a6 /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | |
| parent | 072c87b532a0bfb334787928248863a2561dc849 (diff) | |
| parent | 606e950ccbd02a10f724c73543575a2a4e1ed8cb (diff) | |
| download | rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.gz rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.bz2 rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.zip | |
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
| -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 5e5e30776a..c0f5046bff 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" |