Browse files

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
  • Loading branch information...
1 parent 4c4651a commit 6273753a42cde0a4d52eb276ed066749cb11523b @jeremy jeremy committed Oct 16, 2005
View
3 railties/CHANGELOG
@@ -1,5 +1,8 @@
*SVN*
+* The rails command tries to deduce your MySQL socket by running `mysql_config
+--socket`. If it fails, default to /path/to/your/mysql.sock
+
* Made the rails command use the application name for database names in the tailored database.yml file. Example: "rails ~/projects/blog" will use "blog_development" instead of "rails_development". [Florian Weber]
* Added Rails framework freezing tasks: freeze_gems (freeze to current gems), freeze_edge (freeze to Rails SVN trunk), unfreeze_rails (float with newest gems on system)
View
6 railties/configs/database.yml
@@ -1,7 +1,7 @@
development:
adapter: mysql
database: <%= app_name %>_development
- host: localhost
+ socket: <%= socket %>
username: root
password:
# With the MySQL adapter on localhost, it defaults to /tmp/mysql.sock
@@ -13,13 +13,13 @@ development:
test:
adapter: mysql
database: <%= app_name %>_test
- host: localhost
+ socket: <%= socket %>
username: root
password:
production:
adapter: mysql
database: <%= app_name %>_production
- host: localhost
+ socket: <%= socket %>
username: root
password:
View
7 railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -11,6 +11,8 @@ def initialize(runtime_args, runtime_options = {})
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 @@ def manifest
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"

0 comments on commit 6273753

Please sign in to comment.