Try to figure out which mysql socket to use. Default to /path/to/your/mysql.sock

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2645 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 1 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 f21d2fb6d7..f15fd3754e 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -11,6 +11,8 @@ class AppGenerator < Rails::Generator::Base
     super
     usage if args.empty?
     @destination_root = args.shift
+    @socket = `mysql_config --socket`.strip
+    @socket = '/path/to/your/mysql.sock' if @socket.blank?
   end
 
   def manifest
@@ -32,7 +34,10 @@ class AppGenerator < Rails::Generator::Base
       m.template "helpers/test_helper.rb",        "test/test_helper.rb"
 
       # database.yml and .htaccess
-      m.template "configs/database.yml", "config/database.yml", :assigns => { :app_name => File.basename(File.expand_path(@destination_root)) }
+      m.template "configs/database.yml", "config/database.yml", :assigns => {
+        :app_name => File.basename(File.expand_path(@destination_root)),
+        :socket => @socket
+      }
       m.template "configs/routes.rb",    "config/routes.rb"
       m.template "configs/apache.conf",  "public/.htaccess"