avm-eac_postgresql_base0 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231e086f7da14eed7a6cc7ca494c5f6f2f2f95e4a5f140f4b4117e1796d8e963
-  data.tar.gz: 6d6a062291acb635d8e348341316641988981eb9af3fe335046cd966fa688a83
+  metadata.gz: 84e0a14809137d8b08980f06cb62e81f4ea0142bd3d7c0f3d646a906f49be832
+  data.tar.gz: 8e3f20b69e7af8cc0e4a1445438d0a3696c60bc8debdf9654e180a1c1f51662e
 SHA512:
-  metadata.gz: 1a99015236ad00d72abe000e6525cdaf283511789ca6a479e33258d991ce22fe59ce49205ce255393897e3eff83df49480b61ea1c9051ff919b1321726bff490
-  data.tar.gz: 61420029ee36af6cb8a25f97d778b18ec164cc8ca4e13c592128cd101df62bb6de5fb111fc29bf782dc5e5af1cabc5b8c21a669ebbcc59ab0067c0e0b29b4aac
+  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

@@ -27,12 +27,33 @@ module Avm
            .envvar('PGPASSWORD', password)
       end
 
+      # @return [EacRubyUtils::Envs::Command]
       def dump_gzip_command
-        dump_command.append(['@ESC_|', '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]
+      def password_command_argument
+        "@ESC_PGPASSWORD=#{password}"
       end
 
       def psql_command(database = true)
-        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
+        env.command(password_command_argument, 'psql', *common_command_args(database))
       end
 
       def psql_command_command(sql, database = true)

data/lib/avm/eac_postgresql_base0/instance_with.rb

@@ -8,9 +8,11 @@ module Avm
     module InstanceWith
       def pg
         @pg ||= ::Avm::EacPostgresqlBase0::Instance.new(
-          host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
-                    password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
-                    name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)
+          host_env, host: database_hostname,
+                    port: database_port,
+                    user: database_username,
+                    password: database_password,
+                    name: database_name
         )
       end
     end

data/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.1'
+    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.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,40 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.56'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.56.1
+        version: '0.57'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.56'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.56.1
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: '0.109'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: '0.109'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement