Skip to content
Browse files

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
  • Loading branch information...
1 parent db871c8 commit ae76e227310389170775d0d3cef963daa793e29f @jeremy jeremy committed Nov 18, 2005
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Windows: eliminate the socket option in database.yml. #2924 [Wayne Vucenic <waynev@gmail.com>]
+
* Eliminate nil from newly generated logfiles. #2927 [Blair Zajac <blair@orcaware.com>]
* Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. [Sam Stephenson]
View
41 railties/configs/database.yml
@@ -1,22 +1,26 @@
# MySQL (default setup). Versions 4.1 and 5.0 are recommended.
#
-# Get the fast C bindings:
+# Install the MySQL driver:
# gem install mysql
-# (on OS X: gem install mysql -- --include=/usr/local/lib)
+# On MacOS X:
+# gem install mysql -- --include=/usr/local/lib
+# On Windows:
+# There is no gem for Windows. Install mysql.so from RubyForApache.
+# http://rubyforge.org/projects/rubyforapache
+#
# And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
adapter: mysql
database: <%= app_name %>_development
username: root
password:
-<%= " socket: #{socket}" if socket %>
+<% if socket -%>
+ socket: <%= socket %>
+<% else -%>
+ host: localhost
+<% end -%>
- # Connect on a TCP socket. If omitted, the adapter will connect on the
- # domain socket given by socket instead.
- #host: localhost
- #port: 3306
-
# Warning: The database defined as 'test' will be erased and
# re-generated from your development database when you run 'rake'.
# Do not set this db to the same as development or production.
@@ -25,16 +29,26 @@ test:
database: <%= app_name %>_test
username: root
password:
-<%= " socket: #{socket}" if socket %>
+<% if socket -%>
+ socket: <%= socket %>
+<% else -%>
+ host: localhost
+<% end -%>
production:
adapter: mysql
database: <%= app_name %>_production
username: root
password:
-<%= " socket: #{socket}" if socket %>
+<% if socket -%>
+ socket: <%= socket %>
+<% else -%>
+ host: localhost
+<% end -%>
+### Example database connections. You can safely delete these. ###
+
# PostgreSQL versions 7.4 - 8.1
#
# Get the C bindings:
@@ -48,8 +62,9 @@ postgresql_example:
password:
# Connect on a TCP socket. Omitted by default since the client uses a
- # domain socket that doesn't need configuration.
- #host: remote-database
+ # domain socket that doesn't need configuration. Windows does not have
+ # domain sockets, so uncomment these lines.
+ #host: localhost
#port: 5432
# Schema search path. The server defaults to $user,public
@@ -82,4 +97,4 @@ sqlite3_example:
# In-memory SQLite 3 database. Useful for tests.
sqlite3_in_memory_example:
adapter: sqlite3
- database: ":memory:"
+ database: ":memory:"
View
5 railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -11,8 +11,9 @@ def initialize(runtime_args, runtime_options = {})
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

0 comments on commit ae76e22

Please sign in to comment.
Something went wrong with that request. Please try again.