avm-eac_postgresql_base0 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a67a8652cd229c20b08aa095b294e21d423f02b0b861d1bfcccd5c54fcfc74
-  data.tar.gz: 5a07165d40bac4706e20e39e6eedc72fcafb49c8da1ce9bcabdfe8092d1b89ef
+  metadata.gz: 84e0a14809137d8b08980f06cb62e81f4ea0142bd3d7c0f3d646a906f49be832
+  data.tar.gz: 8e3f20b69e7af8cc0e4a1445438d0a3696c60bc8debdf9654e180a1c1f51662e
 SHA512:
-  metadata.gz: 9a25af8a2ff07eb69af5fff54bacfc45b23d0c33752ed92355e07fc7a0da062ad2cc5e04ff9386722e2d6cda6e722b7837f891224d07ed7ad4a1258fb3e51c64
-  data.tar.gz: 0af9592a57753fd6b46a18323a7e33a44fc4740d6d3dea72bc32bb73c7f737585e885ad70c23e8e0c63b09ac035d757f66662b47dabb842bd89ace7ecace2b11
+  metadata.gz: 520e4c244648f74bd1ba2f870abe3e6e3f4c58d22bf06f4c0b04e6dd926fc401f1e6d7492bfaa37c2a77d52683c85b522c4d74ed60b8824fa99823ca762885c3
+  data.tar.gz: 6c47c1cb2dec4acd690ce7ff7750f38f29b11c5714e2191ceff4cba4601c5da7669ed7f4c1b1058da87a0e5eecd35f2de70e841bee92032f0393ad205b3191a2

data/lib/avm/eac_postgresql_base0/instance/data_unit.rb

@@ -7,6 +7,7 @@ module Avm
     class Instance
       class DataUnit < ::Avm::Instances::Data::Unit
         EXTENSION = '.pgdump.gz'
+        TABLES_SQL = 'select tablename from pg_tables where schemaname = \'public\''
 
         before_load :clear_database
 
@@ -15,24 +16,29 @@ module Avm
         end
 
         def load_command
-          instance.psql_command.prepend(['gzip', '-d', '@ESC_|'])
+          instance.load_gzip_command
         end
 
         private
 
         def clear_database
           info 'Clearing database (Dropping all tables)...'
-          run_sql(drop_all_tables_sql).if_present { |v| run_sql(v) }
-        end
-
-        def drop_all_tables_sql
-          "select 'drop table \"' || tablename || '\" cascade;' from pg_tables " \
-            "where schemaname = 'public';"
+          ts = tables
+          if ts.empty?
+            info 'Database has no tables'
+          else
+            info "Removing #{ts.count} table(s)..."
+            run_sql('drop table ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+          end
         end
 
         def run_sql(sql)
           instance.psql_command_command(sql).execute!
         end
+
+        def tables
+          run_sql(TABLES_SQL).each_line.map(&:strip).reject(&:blank?)
+        end
       end
     end
   end

data/lib/avm/eac_postgresql_base0/instance.rb

@@ -29,7 +29,22 @@ module Avm
 
       # @return [EacRubyUtils::Envs::Command]
       def dump_gzip_command
-        dump_command.pipe(env.command('gzip', '-9', '-c'))
+        dump_command.pipe(gzip_compress_command)
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def gzip_compress_command
+        env.command('gzip', '-9', '-c')
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def gzip_decompress_command
+        env.command('gzip', '-d')
+      end
+
+      # @return [EacRubyUtils::Envs::Command]
+      def load_gzip_command
+        gzip_decompress_command.pipe(psql_command)
       end
 
       # @return [String]

data/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_postgresql_base0
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.109'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.109'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement