avm-eac_postgresql_base0 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e0a14809137d8b08980f06cb62e81f4ea0142bd3d7c0f3d646a906f49be832
-  data.tar.gz: 8e3f20b69e7af8cc0e4a1445438d0a3696c60bc8debdf9654e180a1c1f51662e
+  metadata.gz: f8c272a517744e8283d0f09ef9a1551f1270ebc0a7304bdd52545f1281b40f50
+  data.tar.gz: ac0e819f4a3efcb8797456d2e650a9157dfd15ae4dadcadee919682b4858db3d
 SHA512:
-  metadata.gz: 520e4c244648f74bd1ba2f870abe3e6e3f4c58d22bf06f4c0b04e6dd926fc401f1e6d7492bfaa37c2a77d52683c85b522c4d74ed60b8824fa99823ca762885c3
-  data.tar.gz: 6c47c1cb2dec4acd690ce7ff7750f38f29b11c5714e2191ceff4cba4601c5da7669ed7f4c1b1058da87a0e5eecd35f2de70e841bee92032f0393ad205b3191a2
+  metadata.gz: 4354892b67aab47fd790da261be0adfdefe914225a10bd7036a056612760674082623a08b59d9036ad410703ce491216927060ff02ebcddde529e454d9003037
+  data.tar.gz: 3e518942ed62e30b44b1f7f5178f45632591e5d1b449fd86674d1e0a37b68e65416b1204fafcf8b85ff33facf5b11cadca291e85b53dbd194e6d265071a8160c

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      module Commands
+        DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
+
+        # @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)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def dump_gzip_command
+          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(password_command_argument, 'psql', '--variable', 'ON_ERROR_STOP=t',
+                      *common_command_args(database))
+        end
+
+        def psql_command_command(sql, database = true)
+          psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
+        end
+
+        def root_psql_command(sql = nil)
+          args = ['sudo', '-u', 'postgres', 'psql']
+          args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
+          env.command(*args)
+        end
+
+        def common_command_args(database = true)
+          ['--host', host, '--username', user, '--port', port,
+           (database ? name : MAINTENANCE_DATABASE)]
+        end
+
+        private
+
+        # @return [EacRubyUtils::Envs::Command]
+        def remove_extensions_ddl
+          env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,10 @@ module Avm
     class Instance
       class DataUnit < ::Avm::Instances::Data::Unit
         EXTENSION = '.pgdump.gz'
-        TABLES_SQL = 'select tablename from pg_tables where schemaname = \'public\''
+        SCHEMA_VAR = '%%SCHEMA%%'
+        TABLE_PARTS_SEPARATOR = '/'
+        TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
+          "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
         before_load :clear_database
 
@@ -21,6 +24,12 @@ module Avm
 
         private
 
+        # @param table_list [Array<String>]
+        # @return [String]
+        def drop_tables_sql(table_list)
+          'drop table ' + table_list.map(&:to_s).join(', ') + ' cascade'
+        end
+
         def clear_database
           info 'Clearing database (Dropping all tables)...'
           ts = tables
@@ -28,16 +37,30 @@ module Avm
             info 'Database has no tables'
           else
             info "Removing #{ts.count} table(s)..."
-            run_sql('drop table ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+            run_sql(drop_tables_sql(ts))
           end
         end
 
+        # @param parts [Array<String>, Strings]
+        # @return [String]
+        def join_table_parts(parts)
+          parts = parts.to_s.split(TABLE_PARTS_SEPARATOR) unless parts.is_a?(::Enumerable)
+          parts.map { |p| "\"#{p}\"" }.join('.')
+        end
+
         def run_sql(sql)
           instance.psql_command_command(sql).execute!
         end
 
+        # @return [Array<String>]
         def tables
-          run_sql(TABLES_SQL).each_line.map(&:strip).reject(&:blank?)
+          run_sql(tables_sql).each_line.map(&:strip).reject(&:blank?)
+                             .map { |line| join_table_parts(line) }
+        end
+
+        # @return [String]
+        def tables_sql
+          TABLES_SQL.gsub(SCHEMA_VAR, instance.schema)
         end
       end
     end

data/lib/avm/eac_postgresql_base0/instance.rb

@@ -6,8 +6,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module EacPostgresqlBase0
     class Instance
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
+      DEFAULT_HOSTNAME = '127.0.0.1'
+      DEFAULT_PORT = 5432
+      DEFAULT_SCHEMA = 'public'
       MAINTENANCE_DATABASE = 'postgres'
 
       common_constructor :env, :connection_params do
@@ -22,61 +25,12 @@ module Avm
         ::Avm::EacPostgresqlBase0::Instance::DataUnit.new(self)
       end
 
-      def dump_command
-        env.command('pg_dump', '--no-privileges', '--clean', '--no-owner', *common_command_args)
-           .envvar('PGPASSWORD', password)
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def dump_gzip_command
-        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(password_command_argument, 'psql', *common_command_args(database))
-      end
-
-      def psql_command_command(sql, database = true)
-        psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
-      end
-
-      def root_psql_command(sql = nil)
-        args = ['sudo', '-u', 'postgres', 'psql']
-        args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
-        env.command(*args)
-      end
-
-      def common_command_args(database = true)
-        ['--host', host, '--username', user, '--port', port,
-         (database ? name : MAINTENANCE_DATABASE)]
-      end
-
       def host
-        connection_params[:host] || '127.0.0.1'
+        connection_params[:host] || DEFAULT_HOSTNAME
       end
 
       def port
-        connection_params[:port] || '5432'
+        connection_params[:port] || DEFAULT_PORT
       end
 
       def user
@@ -90,6 +44,10 @@ module Avm
       def name
         connection_params.fetch(:name)
       end
+
+      def schema
+        connection_params[:schema] || DEFAULT_SCHEMA
+      end
     end
   end
 end

data/lib/avm/eac_postgresql_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_postgresql_base0
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.68'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.109'
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,7 @@ files:
 - lib/avm/eac_postgresql_base0.rb
 - lib/avm/eac_postgresql_base0/instance.rb
 - lib/avm/eac_postgresql_base0/instance/assert.rb
+- lib/avm/eac_postgresql_base0/instance/commands.rb
 - lib/avm/eac_postgresql_base0/instance/data_unit.rb
 - lib/avm/eac_postgresql_base0/instance_with.rb
 - lib/avm/eac_postgresql_base0/version.rb