avm-eac_postgresql_base0 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2264f776064ed8277f18dc9bf8b1709917ac80761a6e72ed9101445ef6d91b79
-  data.tar.gz: da0725910f7a61738ae7af19f0d31c7fe5a8fcd612c740231ca9412ba672c105
+  metadata.gz: b225a9cd207947f745ff37aaa23d898088217ff8787076ee9752407c81cbca86
+  data.tar.gz: 375aab52990242c88133d75b04d84b8ba1b8fbcada204413317e1959e92aa105
 SHA512:
-  metadata.gz: 6d9229e8f4cb7df168f1f963d42d109dacdc88da81d9f5ecd0547493573bbf0d4e77aea98b5259907db30cf81d0dfe93847a67dd398c877111fbbcc4a0ebb509
-  data.tar.gz: da16356cfbbcd62084a58d92f34ac1036633bc44deb0fe0d9fd277900f32f13a528204ed02ec1ce1ad32a6517859f8319d758e093c032b6407564f3d662ca3be
+  metadata.gz: 8b98c338d49e17da1a7da5c7697e3e83403bbbaff559e9ef1b58a16ffabe556e971c421cc8ce4f3f19dfc49af2ee802e83ee1797458a619337c0105991a7598d
+  data.tar.gz: 0a6a68ac3769c9c011a35f07c1486ef15318e3b5122b923b34baf4b3403f2544a5d3eab36ae946184df0323fffbe44360d6f80ee876eb7a45028190ecfa928ac

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

@@ -29,7 +29,7 @@ module Avm
         end
 
         def current_owner
-          root_query(<<~SQL
+          root_query(<<~SQL.squish
             SELECT pg_catalog.pg_get_userbyid(datdba)
             FROM pg_catalog.pg_database
             WHERE datname = '#{name}'
@@ -43,7 +43,7 @@ module Avm
 
         def password_ok?
           instance.psql_command_command('SELECT 1', false)
-                  .execute!(exit_outputs: { 512 => 'login_failed' }).strip == '1'
+            .execute!(exit_outputs: { 512 => 'login_failed' }).strip == '1'
         end
 
         def user_exist?

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

@@ -7,13 +7,13 @@ module Avm
   module EacPostgresqlBase0
     class Instance
       module Commands
-        DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
+        DUMP_EXCLUDE_PATTERNS = ['(CREATE|COMMENT ON) EXTENSION',
+                                 'SET default_table_access_method'].freeze
 
         # @return [EacRubyUtils::Envs::Command]
         def dump_command
-          env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
-             .envvar('PGPASSWORD', password)
-             .pipe(remove_extensions_ddl)
+          DUMP_EXCLUDE_PATTERNS
+            .inject(pg_dump_command) { |a, e| a.pipe(exclude_pattern_command(e)) }
         end
 
         # @return [EacRubyUtils::Envs::Command]
@@ -41,12 +41,12 @@ module Avm
           "@ESC_PGPASSWORD=#{password}"
         end
 
-        def psql_command(database = true)
+        def psql_command(database = true) # rubocop:disable Style/OptionalBooleanParameter
           env.command(password_command_argument, 'psql', '--variable', 'ON_ERROR_STOP=t',
                       *common_command_args(database))
         end
 
-        def psql_command_command(sql, database = true)
+        def psql_command_command(sql, database = true) # rubocop:disable Style/OptionalBooleanParameter
           psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
         end
 
@@ -56,7 +56,7 @@ module Avm
           env.command(*args)
         end
 
-        def common_command_args(database = true)
+        def common_command_args(database = true) # rubocop:disable Style/OptionalBooleanParameter
           ['--host', host, '--username', user, '--port', port,
            (database ? name : MAINTENANCE_DATABASE)]
         end
@@ -64,8 +64,14 @@ module Avm
         private
 
         # @return [EacRubyUtils::Envs::Command]
-        def remove_extensions_ddl
-          env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
+        def exclude_pattern_command(pattern)
+          env.command('sed', '--regexp-extended', "s/(^|\\n)#{pattern}[^;]*;//gm")
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def pg_dump_command
+          env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
+            .envvar('PGPASSWORD', password)
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Avm
         SCHEMA_VAR = '%%SCHEMA%%'
         TABLE_PARTS_SEPARATOR = '/'
         TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
-          "pg_tables where schemaname = '#{SCHEMA_VAR}'"
+                     "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
         def do_clear
           ts = tables
@@ -35,7 +35,7 @@ module Avm
         # @param table_list [Array<String>]
         # @return [String]
         def drop_tables_sql(table_list)
-          'drop table ' + table_list.map(&:to_s).join(', ') + ' cascade'
+          "drop table #{table_list.map(&:to_s).join(', ')} cascade"
         end
 
         # @param parts [Array<String>, Strings]
@@ -51,8 +51,8 @@ module Avm
 
         # @return [Array<String>]
         def tables
-          run_sql(tables_sql).each_line.map(&:strip).reject(&:blank?)
-                             .map { |line| join_table_parts(line) }
+          run_sql(tables_sql).each_line.map(&:strip).compact_blank
+            .map { |line| join_table_parts(line) }
         end
 
         # @return [String]

data/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.5.1'
+    VERSION = '0.5.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_postgresql_base0
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2024-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.85'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.85'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.115'
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.115'
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.10'
 description: 
 email: 
 executables: []
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="