Merge pull request rails#54025 from jjatinggoyal/trilogy-config

Default to the `host` config for db connection for trilogy adapter

Author: kamipo

railties/lib/rails/generators/rails/app/templates/config/databases/trilogy.yml.tt

@@ -15,21 +15,23 @@ default: &default
   pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   username: root
   password:
-<% if database.socket -%>
-  socket: <%= database.socket %>
-<% else -%>
   host: <%%= ENV.fetch("DB_HOST") { "<%= database.host %>" } %>
-<% end -%>
 
 development:
   <<: *default
+<% if database.socket -%>
+  socket: <%= database.socket %>
+<% end -%>
   database: <%= app_name %>_development
 
 # 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.
 test:
   <<: *default
+<% if database.socket -%>
+  socket: <%= database.socket %>
+<% end -%>
   database: <%= app_name %>_test
 
 # As with config/credentials.yml, you never want to store sensitive information,