scalingo_databases_rake_tasks 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9375caa0de1e6e6f5f2a7c0c2ac4d0a5a09a6357
-  data.tar.gz: 6dc2b750f6ddb3c52d8af993eb71c3aa57cfc12d
+  metadata.gz: fef412338d874cf4bc5f097a9d3a95b904308211
+  data.tar.gz: 5588bdef817f1dc48de78b3d445a8b558eb8b446
 SHA512:
-  metadata.gz: 4eabd1086dffe6a0afe83076e204debf67af3d2ed3e410dbc6d790ffc41345ec6765f996660d18b89d3ac350f89036355476f149aa61c36b39b0890531bd6787
-  data.tar.gz: f6b6d9ac88615b1a2130b5221a7a15c21f0dcf5bd1289e6e908c1975fda66891f437a5160aea337bdc66d4873d46a82c5d664d9874df0440001dffbd85521910
+  metadata.gz: 4f9d42eedb22b09311d12e7a9ab654051df1b3047e383ada1d760cc14d77347a1a382e85a6c354f73385e2d4579a6a88ed8a2f916b7811eca1be4465a6ba6bfd
+  data.tar.gz: 1bbab205f75415dbb7d13a8dfb567b182288b9138cfb10ae5a1217283c1215e53db4e6538f865a1cb3650592d52e98f228ca694fea8772b5d0543b7da31b5107

data/lib/scalingo_databases_rake_tasks/tasks/common.rake

@@ -24,7 +24,7 @@ namespace :scalingo do
     output = `scalingo -a #{app} env | grep "^#{variable}=" | cut -d '=' -f2 | tr -d '\n'`
     uri = URI(output.strip)
     if uri.to_s.blank?
-      raise VariableError
+      raise VariableError, "Environment variable #{variable} not found."
     else
       [uri.path[1..-1], uri.user, uri.password]
     end
@@ -70,10 +70,10 @@ namespace :scalingo do
     app = ENV["APP"]
     variable = ENV["DB_ENV_NAME"] || default_env_name
     unless app
-      abort 'ENV["APP"] missing.'
+      abort "Environment variable APP not found."
     end
     unless variable
-      abort 'ENV["DB_ENV_NAME"] missing.'
+      abort "Environment variable DB_ENV_NAME not found."
     end
 
     database, user, password = remote_credentials(app, variable)

data/lib/scalingo_databases_rake_tasks/tasks/postgresql.rake

@@ -77,13 +77,21 @@ namespace :scalingo do
         end
 
         base_cmd = "tar xvzOf #{archive_name DUMP_NAME} | "
-        pg_cmd = "pg_restore -O -n public --clean --if-exists #{user_cmd} -h #{host} -p #{port} -d #{database}"
+        pg_cmd = "pg_restore -O -n public --clean"
+        pg_cmd << " --if-exists" if pg_restore_after_9_4
+        pg_cmd << " #{user_cmd} -h #{host} -p #{port} -d #{database}"
         output = "#{base_cmd} PGPASSWORD=[FILTERED] #{pg_cmd}"
         cmd = "#{base_cmd} #{password_cmd} #{pg_cmd}"
 
         puts "*** Executing #{output}"
         system(cmd)
       end
+
+      def pg_restore_after_9_4?
+        version = `pg_restore --version`.split.last
+        major, minor = version.split('.')
+        major.to_i >= 9 && minor.to_i >= 4
+      end
     end
 
   end

data/lib/scalingo_databases_rake_tasks/version.rb

@@ -1,3 +1,3 @@
 module ScalingoDbTasks
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_databases_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Scalingo