Restore backups from a file stream

Author: TristanDamron

Dockerfiles/Dockerfile.geocml-task-scheduler

@@ -1,4 +1,4 @@
-FROM  --platform=linux/amd64 ubuntu:22.04
+FROM  --platform=linux/amd64 ubuntu:latest
 
 USER root
 WORKDIR /

build-resources/geocml-task-scheduler/geocml-task-scheduler/tasks/restore_geocml_db_from_backups.py

@@ -73,7 +73,11 @@ def restore_geocml_db_from_backups():
 
         if file_name_split[0] == "data":
             log("Found CSV data file {}".format(csv_data_file))
-            file_name_split = file_name_split[1].split(".")
+            file_name_split = file_name_split[1].split(".csv")
+            [schema, table] = [
+                file_name_split[0].split(".")[0],
+                file_name_split[0].split(".")[1]
+            ]
             csv_file_path = os.path.join(
                 db_backups_dir, most_recent_backup, csv_data_file
             )
@@ -87,9 +91,10 @@ def restore_geocml_db_from_backups():
             with open(csv_file_path, "r") as f:
                 # Skip the header line
                 next(f)
-                log("Loading data to: {}".format(file_name_split[1]))
+                log(f"Loading data to: {schema}.{table}")
+                cursor.execute(f'SET search_path TO {schema}')
                 cursor.copy_from(
-                    f, f"{file_name_split[1]}", sep=",", columns=columns, null="NULL"
+                    f, table, sep=",", columns=columns, null="NULL"
                 )
 
             log("Finished loading data!")

build-resources/geocml-task-scheduler/make.sh

@@ -3,7 +3,7 @@
 #! nix-shell -p unzip wget
 #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05.tar.gz
 
-TABOR_VERSION=0.3.0
+TABOR_VERSION=0.3.1
 
 touch /task_log
 wget "https://github.com/geoCML/tabor/releases/download/v$TABOR_VERSION/tabor-$TABOR_VERSION-ubuntu-latest.zip" -P /geocml-task-scheduler/