pg_tasks 1.3.3 → 2.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eedb9562ed35e4f14eee1f724e605c71ef026f0
-  data.tar.gz: 8362caf2327c36b50af7bc8906dba6842806777a
+  metadata.gz: 624d4e26327ef5a1005ff2b0d796504def390bc5
+  data.tar.gz: 55ab7b8400af50cb1f082b616ab4d2c267264831
 SHA512:
-  metadata.gz: 697a230867135e471965c3d89bb9f5766ee8c3810634be3affd6aa46b506fdc59c1b6b0cdfa052c3fb0d7887dece3076308f2d14b706fc2a306189334c8e27a0
-  data.tar.gz: a48615a79d90d5afc05a812e7591926a146dbe81867c567a0971d0e480134317eabdc338eb640ac60831145e0fc0a5e9fadb0da7f7fc4443075d093d473f62bb
+  metadata.gz: a1460d625e02201f3ddb3619818cfd50af043fc1df7ed5345e81bf5e3fc76c86481929bfe8d6650e57c6764092b421326c2f35120464ec4bae39246f38c800d9
+  data.tar.gz: 78c658fbf4d5684a5a9a0edd99d06edf63fe8d2ac897ae50bbf64a307e35be40bd8c994710c93a4dea873de4e9a0076eb52b270299a58e9ca47ba77b31aa3511

data/lib/pg_tasks/version.rb

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

data/lib/pg_tasks.rb

@@ -16,12 +16,12 @@ module PgTasks
   DEFAULT_BINARY_STRUCTURE_AND_DATA_FILE_NAME = 'structure_and_data.pgbin'
 
   class << self
-    %w(data_dump data_restore).each do |method_name|
+    %w(data_restore).each do |method_name|
       define_method method_name do |filename = nil|
         ActiveRecord::Tasks::DatabaseTasks \
           .perform_pg_db_task_for_config_and_filename \
             method_name, current_config,
-            filename_or_default_binary_data_file(filename)
+            filename_or_default_binary_structure_and_data_file(filename)
       end
     end
 
@@ -53,12 +53,6 @@ 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,
@@ -70,30 +64,33 @@ end
 module ActiveRecord
   module Tasks
     class PostgreSQLDatabaseTasks
-      def data_dump(filename)
-        set_psql_env
-        command = 'pg_dump -F c -a -T schema_migrations -x -O -f ' \
-          "#{Shellwords.escape(filename.to_s)} " \
-          "#{Shellwords.escape(configuration['database'])}"
-        unless Kernel.system(command)
-          raise 'Error during data_dump'
-        else
-          $stdout.puts "The data of '#{configuration['database']} " \
-            "has been dumped to '#{filename}'"
-        end
-      end
 
       def data_restore(filename)
-        set_psql_env
-        command = 'pg_restore --disable-triggers --exit-on-error ' \
-          '--single-transaction -a -x -O ' \
-          "-d #{Shellwords.escape(configuration['database'])} " \
-          "#{Shellwords.escape(filename.to_s)}"
-        unless Kernel.system(command)
-          raise 'Error during data_restore '
-        else
-          $stdout.puts "Data from '#{filename}' has been restored to \
+        shell_filename= Shellwords.escape filename.to_s
+        list_cmd = "pg_restore -l #{shell_filename}"
+        pg_list = `#{list_cmd}`
+        raise "Command #{list_cmd} failed " if $?.exitstatus != 0
+        restore_list = pg_list.split(/\n/) \
+          .reject{|l| l =~ /TABLE DATA .* schema_migrations/}.join("\n")
+        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)
+            raise 'Error during data_restore '
+          else
+            $stdout.puts "Data from '#{filename}' has been restored to \
                         '#{configuration['database']}'"
+          end
+        ensure
+          restore_list_file.close
+          restore_list_file.unlink
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_tasks
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.pre.1
 platform: ruby
 authors:
 - Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,12 +86,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Tasks and Functions for Ruby on Rails