diff options
| author | Tristan Dunn <tristanzdunn@gmail.com> | 2009-08-09 16:22:53 -0400 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-08-09 14:35:57 -0700 |
| commit | 1af9bd58a04d14dc727713d2e581fafebc0e1d96 (patch) | |
| tree | 6e72beab8cf1419aa043d47cf22920ec4d37a759 /activerecord/lib | |
| parent | 202b091373ed4d6c78adc7af5e89a359ff0fff2d (diff) | |
| download | rails-1af9bd58a04d14dc727713d2e581fafebc0e1d96.tar.gz rails-1af9bd58a04d14dc727713d2e581fafebc0e1d96.tar.bz2 rails-1af9bd58a04d14dc727713d2e581fafebc0e1d96.zip | |
No longer require database name for MySQL to allow cross database selects.
[#1122 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 2b882a1f25..2812dbb522 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -53,12 +53,7 @@ module ActiveRecord socket = config[:socket] username = config[:username] ? config[:username].to_s : 'root' password = config[:password].to_s - - if config.has_key?(:database) - database = config[:database] - else - raise ArgumentError, "No database specified. Missing argument: database." - end + database = config[:database] # Require the MySQL driver and define Mysql::Result.all_hashes unless defined? Mysql |