Merge pull request #7 from cepro/remove-properties-owner

Add corporate bodies grants with shared ownership support

Author: chatch

.github/workflows/build-test.yml

@@ -25,7 +25,7 @@ jobs:
           --health-retries 10
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Sqitch install
         run: docker pull sqitch/sqitch && curl -L https://git.io/JJKCn -o /usr/local/bin/sqitch && chmod +x /usr/local/bin/sqitch && sqitch --help
@@ -41,7 +41,7 @@ jobs:
             -f /sqitch/ci-bootstrap.sql
 
       - name: Checkout flows-db
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: cepro/simt-flows-db
           path: flows-db

.gitignore

@@ -3,3 +3,4 @@ dumps/
 *.secret.txt
 .tmp
 tmpdocs/
+opencode.json

bin/dump-local-supabase-db-data

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+DUMP_FILE=/db/timescale-local-data-`date +%s`.sql
+HOST_DIR=`pwd`/dumps
+
+docker run \
+        --rm \
+        --network host \
+        -v $HOST_DIR:/db \
+        -v ~/.pgpass:/root/.pgpass:ro \
+        postgres:17-alpine \
+    pg_dump \
+        --host localhost \
+        --port 15432 \
+        --dbname=tsdb \
+        --username=tsdbadmin \
+        --file=$DUMP_FILE \
+        --schema=myenergy \
+        --data-only \
+        --inserts --column-inserts
+
+echo "Dumped to $HOST_DIR/`basename $DUMP_FILE`"

bin/dump-local-supabase-db-schema

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+DUMP_FILE=/db/timescale-local-schema-`date +%s`.sql
+HOST_DIR=`pwd`/dumps
+
+docker run \
+        --rm \
+        --network host \
+        -v $HOST_DIR:/db \
+        -v ~/.pgpass:/root/.pgpass:ro \
+        postgres:17-alpine \
+    pg_dump \
+        --host localhost \
+        --port 15432 \
+        --dbname=tsdb \
+        --username=tsdbadmin \
+        --file=$DUMP_FILE \
+        --schema=myenergy \
+        --clean --if-exists --schema-only
+
+echo "Dumped to $HOST_DIR/`basename $DUMP_FILE`"

bin/dump-local-timescale-data

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if [ -z "$1" ]
+then
+  echo "No backup file specified"
+  return 1
+fi
+
+DUMP_FILE=$1
+
+HOST_DIR=/tmp/timescale-restore
+mkdir -p $HOST_DIR
+cp $DUMP_FILE $HOST_DIR
+
+docker run \
+        --rm \
+        --network host \
+        -v $HOST_DIR:/db \
+        -v ~/.pgpass:/root/.pgpass:ro \
+        postgres:17-alpine \
+    psql \
+        --log-file=/db/restore.log \
+        --host localhost \
+        --port 15432 \
+        --username=tsdbadmin \
+        --dbname=tsdb \
+        --file=/db/$DUMP_FILE

bin/dump-local-timescale-schema

@@ -732,12 +732,11 @@ BEGIN
         occupier_id := owner_id;
     END IF;
 
-    -- Create property
-    INSERT INTO myenergy.properties (plot, description, owner, esco, id)
+    -- Create property (owner column removed in 0020_shared_ownership_removal - use registered_proprietors instead)
+    INSERT INTO myenergy.properties (plot, description, esco, id)
         VALUES (
             'Plot-' || plot_number,
             description,
-            owner_id,
             esco_id,
             property_id
         );