From d05df493494dcd34c378e706afed28b829db430f Mon Sep 17 00:00:00 2001 From: Sumeet Singh Date: Tue, 7 May 2013 20:47:38 -0400 Subject: [PATCH] dm:create and dm:drop did not pass the arguments to the #system correctly. Using the array approach that is being used for the mysql adapter. --- .../lib/padrino-gen/padrino-tasks/datamapper.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb b/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb index 8143d4cc5..5a48e10b8 100644 --- a/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb +++ b/padrino-gen/lib/padrino-gen/padrino-tasks/datamapper.rb @@ -58,7 +58,12 @@ puts "=> Creating database '#{database}'" case config[:adapter] when 'postgres' - system("createdb", "-E", charset, "-h", host, "-U", user, database) + arguments = [] + arguments << "--encoding=#{charset}" if charset + arguments << "--host=#{host}" if host + arguments << "--username=#{user}" if user + arguments << database + system("createdb", *arguments) puts "<= dm:create executed" when 'mysql' arguments = ["--user=#{user}"] @@ -88,7 +93,11 @@ puts "=> Dropping database '#{database}'" case config[:adapter] when 'postgres' - system("dropdb", "-h", host, "-U", user, database) + arguments = [] + arguments << "--host=#{host}" if host + arguments << "--username=#{user}" if user + arguments << database + system("dropdb", *arguments) puts "<= dm:drop executed" when 'mysql' arguments = ["--user=#{user}"]