pg_tasks 2.0.0.pre.1 → 2.1.0.pre.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624d4e26327ef5a1005ff2b0d796504def390bc5
-  data.tar.gz: 55ab7b8400af50cb1f082b616ab4d2c267264831
+  metadata.gz: 3c44ff95c6ff165f8e4eebe2e38750f22ddcf0bc
+  data.tar.gz: 1d77ee58032ab946f63c2d9f90884d76a5841479
 SHA512:
-  metadata.gz: a1460d625e02201f3ddb3619818cfd50af043fc1df7ed5345e81bf5e3fc76c86481929bfe8d6650e57c6764092b421326c2f35120464ec4bae39246f38c800d9
-  data.tar.gz: 78c658fbf4d5684a5a9a0edd99d06edf63fe8d2ac897ae50bbf64a307e35be40bd8c994710c93a4dea873de4e9a0076eb52b270299a58e9ca47ba77b31aa3511
+  metadata.gz: 26bfd291edaecc238ef0f412d15888d6cc53247b092f6af0641d8972730d25ae14299d7311559cc9b08a46d26745ea3c4eef7f6b9e610af5c0573373dd1f24e7
+  data.tar.gz: 8b341ef981e825b99df07c6ae77c57b1e49e40b0140ff8121c26bdd2da48f937ab0833c4cd7e2b8c5f8925af17b35db407e5a1e8160ea50b8a0d55fbf1efa8ce

data/lib/pg_tasks/version.rb

@@ -7,5 +7,5 @@
 #++
 
 module PgTasks
-  VERSION = '2.0.0-1'
+  VERSION = '2.1.0-0'
 end

data/lib/pg_tasks.rb

@@ -21,7 +21,7 @@ module PgTasks
         ActiveRecord::Tasks::DatabaseTasks \
           .perform_pg_db_task_for_config_and_filename \
             method_name, current_config,
-            filename_or_default_binary_structure_and_data_file(filename)
+            filename_or_default_binary_data_file(filename)
       end
     end
 
@@ -53,6 +53,12 @@ module PgTasks
       ActiveRecord::Tasks::DatabaseTasks.current_config
     end
 
+    def filename_or_default_binary_data_file(filename)
+      (filename.present? && filename) || \
+        File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir,
+                  DEFAULT_BINARY_DATA_FILE_NAME)
+    end
+
     def filename_or_default_binary_structure_and_data_file(filename)
       (filename.present? && filename) || \
         File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir,
@@ -75,11 +81,10 @@ module ActiveRecord
         begin
           restore_list_file = Tempfile.new 'pg_restore_list'
           restore_list_file.write restore_list
+
           set_psql_env
           command = 'pg_restore --data-only --exit-on-error ' \
             ' --single-transaction --no-privileges --no-owner ' \
-            ' --disable-trigger ' \
-            " -L #{restore_list_file.path} " \
             " -d #{Shellwords.escape(configuration['database'])} " \
             " #{shell_filename }"
           unless Kernel.system(command)
@@ -109,7 +114,7 @@ module ActiveRecord
 
       def structure_and_data_restore(filename)
         set_psql_env
-        command = 'pg_restore --disable-triggers --exit-on-error ' \
+        command = 'pg_restore --create --clean --disable-triggers --exit-on-error ' \
           '--single-transaction -x -O -d ' \
           "#{Shellwords.escape(configuration['database'])} " \
           "#{Shellwords.escape(filename.to_s)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_tasks
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
+  version: 2.1.0.pre.0
 platform: ruby
 authors:
 - Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Tasks and Functions for Ruby on Rails