From f028ec440bb54fae49e3cd5bfa5dcfa0304189c9 Mon Sep 17 00:00:00 2001 From: Robert Mitwicki Date: Mon, 8 Oct 2012 16:39:21 +0300 Subject: [PATCH 1/2] Update templates/rails/database.yml.rb Batter way to get application name. The old one cause error message on r3.2.8 --- templates/rails/database.yml.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/rails/database.yml.rb b/templates/rails/database.yml.rb index afcbb75..d725c23 100644 --- a/templates/rails/database.yml.rb +++ b/templates/rails/database.yml.rb @@ -1,5 +1,4 @@ -# TODO think about a better way -db_name = app_path.split('/').last +db_name = Rails.application.class.parent_name database = options[:database].delete('jdbc') database = 'postgres' if database == 'postgresql' From 6a78db4bbf796871677e3233184545c0c490d523 Mon Sep 17 00:00:00 2001 From: Robert Mitwicki Date: Thu, 11 Oct 2012 08:13:50 +0200 Subject: [PATCH 2/2] Improve database.yml.rb template --- templates/rails/database.yml.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/rails/database.yml.rb b/templates/rails/database.yml.rb index d725c23..6d00b81 100644 --- a/templates/rails/database.yml.rb +++ b/templates/rails/database.yml.rb @@ -1,4 +1,4 @@ -db_name = Rails.application.class.parent_name +db_name = Rails.application.class.parent_name.underscore database = options[:database].delete('jdbc') database = 'postgres' if database == 'postgresql'