From 064581cb2fce7a253b98bea0345e030fb436973b Mon Sep 17 00:00:00 2001 From: provokateurin Date: Mon, 29 Dec 2025 22:28:33 +0100 Subject: [PATCH 1/2] fix: Adjust script to generate the example --- example/foo.png | Bin 109 -> 107 bytes example/foo.sql | 30 +++++++---------------------- example/migrations/001_init.up.sql | 30 +++++++---------------------- generate-example.sh | 4 +++- 4 files changed, 17 insertions(+), 47 deletions(-) diff --git a/example/foo.png b/example/foo.png index 9118f474da83d5b9f3c358e8284cc59d32c04e3f..54c13c71399941d2288c64782d02666dca37df86 100644 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1SHi;jSd1S&H|6fVg?4jBOuH;Rhv&5C@Aac z;uvDln;dfWO6mdzgTO_VA^%tW3;etISNn!Kh93zGOAjy|-~}pV@O1TaS?83{1OVLk B9oGN= literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1SGw${mubWoCO|{#S9Gmi6G3l!hU%sP*C2} z#WBR9H~G*1|MtwO4V_MZ7rXUH8DA-LFW0xQE7U1rS%CX0B1N*O#|{an^LB{Ts5 DJuw{m diff --git a/example/foo.sql b/example/foo.sql index 0ac60db..f46bd93 100644 --- a/example/foo.sql +++ b/example/foo.sql @@ -1,26 +1,10 @@ --- Database generated with pgModeler (PostgreSQL Database Modeler). --- pgModeler version: 0.9.4 --- PostgreSQL version: 13.0 --- Project Site: pgmodeler.io --- Model Author: --- --- -- object: alice | type: ROLE -- --- -- DROP ROLE IF EXISTS alice; --- CREATE ROLE alice WITH ; --- -- ddl-end -- --- --- -- object: bob | type: ROLE -- --- -- DROP ROLE IF EXISTS bob; --- CREATE ROLE bob WITH ; --- -- ddl-end -- --- +-- ** Database generated with pgModeler (PostgreSQL Database Modeler). +-- ** pgModeler version: 1.2.2 +-- ** PostgreSQL version: 18.0 +-- ** Project Site: pgmodeler.io +-- ** Model Author: --- --- Database creation must be performed outside a multi lined SQL file. --- These commands were put in this file only as a convenience. --- --- -- object: bar | type: DATABASE -- --- -- DROP DATABASE IF EXISTS bar; --- CREATE DATABASE bar; --- -- ddl-end -- --- +SET search_path TO pg_catalog,public; +-- ddl-end -- diff --git a/example/migrations/001_init.up.sql b/example/migrations/001_init.up.sql index 0ac60db..f46bd93 100644 --- a/example/migrations/001_init.up.sql +++ b/example/migrations/001_init.up.sql @@ -1,26 +1,10 @@ --- Database generated with pgModeler (PostgreSQL Database Modeler). --- pgModeler version: 0.9.4 --- PostgreSQL version: 13.0 --- Project Site: pgmodeler.io --- Model Author: --- --- -- object: alice | type: ROLE -- --- -- DROP ROLE IF EXISTS alice; --- CREATE ROLE alice WITH ; --- -- ddl-end -- --- --- -- object: bob | type: ROLE -- --- -- DROP ROLE IF EXISTS bob; --- CREATE ROLE bob WITH ; --- -- ddl-end -- --- +-- ** Database generated with pgModeler (PostgreSQL Database Modeler). +-- ** pgModeler version: 1.2.2 +-- ** PostgreSQL version: 18.0 +-- ** Project Site: pgmodeler.io +-- ** Model Author: --- --- Database creation must be performed outside a multi lined SQL file. --- These commands were put in this file only as a convenience. --- --- -- object: bar | type: DATABASE -- --- -- DROP DATABASE IF EXISTS bar; --- CREATE DATABASE bar; --- -- ddl-end -- --- +SET search_path TO pg_catalog,public; +-- ddl-end -- diff --git a/generate-example.sh b/generate-example.sh index ae4c231..c7a75d6 100755 --- a/generate-example.sh +++ b/generate-example.sh @@ -8,7 +8,9 @@ cd example TREK_VERSION=latest \ TREK_MODEL_NAME=foo \ TREK_DATABASE_NAME=bar \ -TREK_DATABASE_USERS=alice,bob \ +TREK_ROLES=alice,bob \ go run .. init go run .. check + +go run .. generate --stdout From b768a59a5e323c3a67fd053dddf2cddf0dadc13c Mon Sep 17 00:00:00 2001 From: GeertJohan Date: Wed, 31 Dec 2025 09:36:17 +0100 Subject: [PATCH 2/2] README.md: Update example config --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0c964dd..875dd9c 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,9 @@ Inside a directory create `trek.yaml`: ```yaml model_name: db_name: -db_users: - - - - +roles: + - name: db_user_1 + - name: db_user_2 ``` Create `.dbm` using pgModeler.