aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 12:15:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-07 12:15:04 +0000
commitba86b8497fa71f81fa771cf94d487efa10f3b5bf (patch)
treed42b5bcf60aff65385c7cca369f774261e2fe9e8 /railties
parent6461318f9e0415d6115e274b81db04d5dbcce1ca (diff)
downloadrails-ba86b8497fa71f81fa771cf94d487efa10f3b5bf.tar.gz
rails-ba86b8497fa71f81fa771cf94d487efa10f3b5bf.tar.bz2
rails-ba86b8497fa71f81fa771cf94d487efa10f3b5bf.zip
Only use a socket if there
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/database.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/configs/database.yml b/railties/configs/database.yml
index c3a93c3ee6..581c59f5d5 100644
--- a/railties/configs/database.yml
+++ b/railties/configs/database.yml
@@ -15,8 +15,7 @@ development:
username: root
password:
- # Connect on a domain socket.
- <%= "socket: #{socket}" %>
+ <%= "socket: #{socket}" if socket %>
# Connect on a TCP socket. If omitted, the adapter will connect on the
# domain socket given by the socket parameter instead.