Merge branch 'feat/sql-editor-syntax-highlighting' of https://github.com/mohamadyasser118/pgwatch into feat/sql-editor-syntax-highlighting

Author: mohamadyasser118

.gitignore

@@ -15,7 +15,7 @@
 # Protobuf files
 *.pb.go
 
-# Packages ouput folder
+# Packages output folder
 dist
 docs/godoc
 site

docker/Dockerfile.timescaledb-plpython3u

@@ -0,0 +1,4 @@
+FROM timescale/timescaledb:latest-pg18
+
+# Install plpython3u
+RUN set -ex && apk add --virtual .plpython3-deps --no-cache py3-psutil --repository http://nl.alpinelinux.org/alpine/edge/testing postgresql-plpython3

docker/compose.timescaledb.yml

@@ -1,18 +1,25 @@
 services:
   postgres:
     user: postgres
-    image: &pgimage timescale/timescaledb:latest-pg17
+    build:
+      context: .
+      dockerfile: Dockerfile.timescaledb-plpython3u
+    # image: &pgimage timescale/timescaledb:latest-pg18
     container_name: postgres
     command:
       - "-cshared_preload_libraries=pg_stat_statements,timescaledb"
       - "-cpg_stat_statements.track=all"
+      - "-cpg_stat_statements.track_planning=on"
       - "-ctrack_io_timing=on"
       - "-ctrack_functions=pl"
+      - "-clog_destination=csvlog"
+      - "-clogging_collector=on"
     ports:
       - "5432:5432"
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
     volumes:
+      - "pgdata:/var/lib/postgresql/docker"  
       - "./bootstrap/init_replication.sh:/docker-entrypoint-initdb.d/init_replication.sh"
       - "./bootstrap/create_role_db.sql:/docker-entrypoint-initdb.d/create_role_db.sql"
     healthcheck:
@@ -23,7 +30,10 @@ services:
 
   postgres-standby:
     user: postgres
-    image: *pgimage
+    build:
+      context: .
+      dockerfile: Dockerfile.timescaledb-plpython3u
+    # image: *pgimage
     container_name: postgres-standby
     environment:
       POSTGRES_PASSWORD: standbypass
@@ -35,9 +45,37 @@ services:
         condition: service_healthy
     command: >
       bash -c "
-      rm -rf /var/lib/postgresql/data/* &&
-      pg_basebackup -h postgres --pgdata=/var/lib/postgresql/data --wal-method=stream --progress --write-recovery-conf --create-slot --slot=standby_slot &&
-      chmod 0700 /var/lib/postgresql/data &&
-      postgres"
+        echo 'Setting up standby server...'
+        export PGDATA=/var/lib/postgresql/standby
+        
+        # Check if data directory already exists and is initialized
+        if [ -f /var/lib/postgresql/standby/PG_VERSION ]; then
+          echo 'Data directory already exists and is initialized, starting PostgreSQL...'
+        else
+          echo 'Initializing new standby server...'
+          
+          # Create replication slot if it doesn't exist
+          psql -h postgres -U postgres -c \"SELECT * FROM pg_create_physical_replication_slot('standby_slot');\" 2>/dev/null || true
+          
+          # Create custom data directory with correct permissions
+          mkdir -p /var/lib/postgresql/standby
+          chmod 0700 /var/lib/postgresql/standby
+          
+          # Remove any existing files to ensure clean backup
+          rm -rf /var/lib/postgresql/standby/* || true
+          
+          # Create base backup directly to our custom directory
+          pg_basebackup -h postgres -U postgres -D /var/lib/postgresql/standby -Xs -P -R -S standby_slot
+          
+          # Ensure correct permissions after backup
+          chmod 0700 /var/lib/postgresql/standby
+        fi
+        
+        # Start PostgreSQL with custom data directory
+        exec postgres -D /var/lib/postgresql/standby -c shared_preload_libraries=pg_stat_statements -c pg_stat_statements.track=all -c track_io_timing=on -c track_functions=pl -c log_destination=csvlog -c logging_collector=on
+      "
     links:
       - postgres
+
+volumes:
+  pgdata:

docker/demo/Dockerfile

@@ -120,7 +120,7 @@ EXPOSE 9187
 # pprof port
 EXPOSE 6060
 
-### Volumes for easier updating to newer to newer pgwatch containers
+### Volumes for easier updating to newer pgwatch containers
 ### Backwards compatibility is not 100% guaranteed so a backup
 ### using traditional means is still recommended before updating - see "Updating to a newer Docker version" from README