diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-18 07:30:05 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-11-18 07:30:05 +0000 |
| commit | ae76e227310389170775d0d3cef963daa793e29f (patch) | |
| tree | 73539245a86ec738248c58ce04166016f9a9b5ac /railties/lib/rails_generator/generators/applications | |
| parent | db871c8d54175a11e113fd8b147a041a4a44dfe9 (diff) | |
| download | rails-ae76e227310389170775d0d3cef963daa793e29f.tar.gz rails-ae76e227310389170775d0d3cef963daa793e29f.tar.bz2 rails-ae76e227310389170775d0d3cef963daa793e29f.zip | |
Windows: eliminate the socket option in database.yml. Closes #2924.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3082 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/applications')
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 2713854b61..0818167fc4 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -11,8 +11,9 @@ class AppGenerator < Rails::Generator::Base super usage if args.empty? @destination_root = args.shift - @socket = MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } - @socket = '/path/to/your/mysql.sock' if @socket.blank? + unless RUBY_PLATFORM =~ /mswin32/ + @socket = MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } + end end def manifest |