Merge pull request #109 from UW-Macrostrat/migration-updates

Migration updates

Author: davenquinn

.idea/dataSources.xml

@@ -14,9 +14,13 @@ caching and harmonization).
 
 ## Installation
 
-To install the Python application that controls Macrostrat, head to the
-[py-root](py-root) directory. Running `make` will install the Python
-dependencies and build the application.
+- Running `make` will install the Python dependencies and build the application.
+- `make test` will run the test suite.
+- `make install` will install the application into the local root.
+
+Setting the `MACROSTRAT_PYROOT` environment variable allows a different root
+Python version to be installed. This can be used to add new plugins
+or application dependencies.
 
 ## Usage
 
@@ -74,3 +78,4 @@ Documentation is a work in progress. We have starting points for:
 
 Other documentation of general interest can be found in the [docs/](docs/)
 directory.
+

README.md

@@ -1,5 +1,5 @@
-# Database container for local development
 FROM imresamu/postgis:15-3.4
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  postgresql-15-pgaudit
 
-# TODO: add extensions
-RUN echo "Hello from database container!"
+CMD docker-entrypoint.sh postgres -c shared_preload_libraries=pgaudit

base-images/database/Dockerfile

@@ -62,7 +62,7 @@ export PATH="$VIRTUAL_ENV/bin:$PATH"
 # Set the poetry root directory to the script directory
 if [ "$1" = "poetry" ]; then
   shift
-  $_poetry "$@"
+  $_poetry --directory "$SCRIPT_DIR" "$@"
   exit $?
 fi
 
@@ -85,9 +85,13 @@ if [ "$1" = "install" ]; then
     fi
     $SUDO rm -f "$install_loc"
     $SUDO ln -sf "$this_file" "$install_loc"
+  else
+    echo -e "Macrostrat command already available at at \033[36m$install_loc\033[0m"
+    echo -e ""
   fi
 
   shift
+  $_poetry --directory "$SCRIPT_DIR" lock "$@"
   $_poetry --directory "$SCRIPT_DIR" install "$@"
   exit $?
 fi

bin/macrostrat

@@ -1,13 +1,24 @@
 CREATE SCHEMA IF NOT EXISTS maps_metadata;
 
-CREATE TYPE ingest_state AS ENUM ('pending', 'ingested', 'prepared', 'failed', 'abandoned', 'post_harmonization');
-CREATE TYPE ingest_type AS ENUM ('vector', 'ta1_output');
+CREATE TYPE maps.ingest_state AS ENUM (
+  'pending',
+  'ingested',
+  'prepared',
+  'failed',
+  'abandoned',
+  'post_harmonization'
+);
+
+CREATE TYPE maps.ingest_type AS ENUM (
+  'vector',
+  'ta1_output'
+);
 
 CREATE TABLE maps_metadata.ingest_process
 (
     id                serial primary key,
-    state             ingest_state,
-    type              ingest_type,
+    state             maps.ingest_state,
+    type              maps.ingest_type,
     comments          text,
     source_id         integer
         references maps.sources,
@@ -20,13 +31,9 @@ CREATE TABLE maps_metadata.ingest_process
     map_id            text
 );
 
-ALTER TABLE maps_metadata.ingest_process
-    owner to macrostrat;
 
 CREATE TABLE maps_metadata.ingest_process_tag (
     ingest_process_id integer NOT NULL
         references maps_metadata.ingest_process,
     tag character varying(255) NOT NULL
 );
-
-ALTER TABLE maps_metadata.ingest_process_tag OWNER TO macrostrat;