From ae76e227310389170775d0d3cef963daa793e29f Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 18 Nov 2005 07:30:05 +0000 Subject: 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 --- .../lib/rails_generator/generators/applications/app/app_generator.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails_generator/generators/applications') 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 -- cgit v1.2.3