lib/jets/commands/import/templates/config/database.yml in jets-1.0.6 vs lib/jets/commands/import/templates/config/database.yml in jets-1.0.7
- old
+ new
@@ -1,13 +1,13 @@
default: &default
adapter: <%= @adapter %>
encoding: utf8
pool: <%%= ENV["DB_POOL"] || 5 %>
database: <%%= ENV['DB_NAME'] || '<%= @database_development %>' %>
-<% if @adapter == 'mysql' -%>
- username: <%%= ENV['DB_USER'] || 'root' %>
-<% else -%>
+<% if @adapter == 'postgresql' -%>
username: <%%= ENV['DB_USER'] || ENV['USER'] %>
+<% else -%>
+ username: <%%= ENV['DB_USER'] || 'root' %>
<% end -%>
password: <%%= ENV['DB_PASS'] %>
host: <%%= ENV["DB_HOST"] %>
url: <%%= ENV['DATABASE_URL'] %> # takes higher precedence than other settings