Merge branch '277-logical-plain-text-restore' into 'master'

feat: support restoring from a plain-text files (#277)

Closes #277

See merge request postgres-ai/database-lab!311

Author: agneum

configs/config.example.logical_generic.yml

@@ -148,7 +148,7 @@ retrieval:
       options:
         # The dump file will be automatically created on this location and then used to restore.
         # Ensure that there is enough disk space.
-        dumpLocation: "/var/lib/dblab/dblab_pool/dump/db.dump"
+        dumpLocation: "/var/lib/dblab/dblab_pool/dump"
 
         # The Docker image containing the tools required to get a dump.
         dockerImage: "postgresai/extended-postgres:13"
@@ -179,7 +179,7 @@ retrieval:
         #   database1:
         #     # Option for a partial dump. Do not specify the tables section to dump all available tables.
         #     tables:
-        #       - test
+        #       - table1
         #   database2:
         #   databaseN:
 
@@ -207,8 +207,8 @@ retrieval:
     # "restore" option in the "logicalDump" job.
     logicalRestore:
       options:
-        # The location of the archive file (or directory, for a directory-format archive) to be restored.
-        dumpLocation: "/var/lib/dblab/dblab_pool/dump/db.dump"
+        # The location of the archive files (or directories, for directory-format archives) to be restored.
+        dumpLocation: "/var/lib/dblab/dblab_pool/dump"
 
         # The Docker image containing the tools required to restore.
         dockerImage: "postgresai/extended-postgres:13"

configs/config.example.logical_rds_iam.yml

@@ -147,7 +147,7 @@ retrieval:
       options:
         # The dump file will be automatically created on this location and then used to restore.
         # Ensure that there is enough disk space.
-        dumpLocation: "/var/lib/dblab/dblab_pool/dump/rds_db.dump"
+        dumpLocation: "/var/lib/dblab/dblab_pool/dump"
 
         # The Docker image containing the tools required to get a dump.
         dockerImage: "postgresai/extended-postgres:13"
@@ -210,7 +210,7 @@ retrieval:
     logicalRestore:
       options:
         # The location of the archive file (or directory, for a directory-format archive) to be restored.
-        dumpLocation: "/var/lib/dblab/dblab_pool/dump/rds_db.dump"
+        dumpLocation: "/var/lib/dblab/dblab_pool/dump"
 
         # The Docker image containing the tools required to restore.
         dockerImage: "postgresai/extended-postgres:13"
@@ -236,7 +236,7 @@ retrieval:
         #     format: directory
         #     # Option for a partial restore. Do not specify the tables section to restore all available tables.
         #     tables:
-        #       - test
+        #       - table1
         #   database2:
         #   databaseN:
 

pkg/retrieval/engine/postgres/logical/dump.go

@@ -98,6 +98,7 @@ type Source struct {
 type DBDefinition struct {
 	Tables []string `yaml:"tables"`
 	Format string   `yaml:"format"`
+	dbName string
 }
 
 type dumpJobConfig struct {
@@ -426,10 +427,12 @@ func (d *DumpJob) dumpDatabase(ctx context.Context, dumpContID, dbName string, d
 		log.Msg("Partial dump will be run. Tables for dumping: ", strings.Join(dbDefinition.Tables, ", "))
 	}
 
-	if err := d.performDumpCommand(ctx, dumpContID, types.ExecConfig{
+	if output, err := d.performDumpCommand(ctx, dumpContID, types.ExecConfig{
+		Tty: true,
 		Cmd: dumpCommand,
 		Env: d.getExecEnvironmentVariables(),
 	}); err != nil {
+		log.Dbg(output)
 		return errors.Wrap(err, "failed to dump a database")
 	}
 
@@ -508,14 +511,12 @@ func (d *DumpJob) setupConnectionOptions(ctx context.Context) error {
 	return nil
 }
 
-func (d *DumpJob) performDumpCommand(ctx context.Context, contID string, commandCfg types.ExecConfig) error {
+func (d *DumpJob) performDumpCommand(ctx context.Context, contID string, commandCfg types.ExecConfig) (string, error) {
 	if d.DumpOptions.Restore.Enabled {
 		d.dbMark.DataStateAt = time.Now().Format(tools.DataStateAtFormat)
 	}
 
-	_, err := tools.ExecCommandWithOutput(ctx, d.dockerClient, contID, commandCfg)
-
-	return err
+	return tools.ExecCommandWithOutput(ctx, d.dockerClient, contID, commandCfg)
 }
 
 func (d *DumpJob) getEnvironmentVariables(password string) []string {