Added the ability to view variables with the RECORD type

.github/workflows/docker-publish.yaml

@@ -0,0 +1,88 @@
+name: Docker image for multi-arch
+
+on:
+  workflow_dispatch:
+  schedule:
+    #every month the 23rd at 6:23am
+    - cron: '23 6 23 * *'
+
+env:
+  PG_IMAGE: postgres-debugger
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image:
+          - bullseye
+          - bookworm
+        platform: 
+          - linux/amd64
+          - linux/amd64,linux/arm64
+        version:
+          - 11
+          - 12
+          - 13
+          - 14
+          - 15
+          - 16
+        exclude:
+          - platform: linux/amd64,linux/arm64
+            version: 11
+          - platform: linux/amd64,linux/arm64
+            version: 12
+          - platform: linux/amd64,linux/arm64
+            version: 13
+          - platform: linux/amd64
+            version: 14
+          - platform: linux/amd64
+            version: 15
+          - platform: linux/amd64
+            version: 16
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: print-vars
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push bullseye
+        if: matrix.image == 'bullseye'
+        uses: docker/build-push-action@v4
+        with:
+          context: docker
+          platforms: ${{ matrix.platform }}
+          build-args: |
+            TAG=${{ matrix.version }}
+            BASE_IMAGE=${{ matrix.version }}-${{ matrix.image }}
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.PG_IMAGE }}:${{ matrix.version }}-${{ matrix.image }}
+
+      - name: Build and push bookworm
+        if: matrix.image == 'bookworm'
+        uses: docker/build-push-action@v4
+        with:
+          context: docker
+          platforms: ${{ matrix.platform }}
+          build-args: |
+            TAG=${{ matrix.version }}
+            BASE_IMAGE=${{ matrix.version }}-${{ matrix.image }}
+          push: true
+          tags: | 
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.PG_IMAGE }}:${{ matrix.version }}-${{ matrix.image }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.PG_IMAGE }}:${{ matrix.version }}
+
+

.gitignore

@@ -0,0 +1,5 @@
+*.o
+*.bc
+*.so
+.vscode
+vcpkg

INSTALL.md

@@ -0,0 +1,36 @@
+# Install with docker container
+
+Tested with succes with PG 13 & 14
+Replace X with your version
+
+## Run docker container
+> docker run --name postgres-14-idea-debugger -p 5442:5432 -e POSTGRES_PASSWORD=postgres -d postgres:1X
+
+## Install Postgres and debugger sources
+
+> apt update && apt upgrade  
+
+> apt install git build-essential libreadline-dev zlib1g-dev bison libkrb5-dev flex postgresql-server-dev-1X
+
+> cd /usr/src/
+
+> git clone https://github.com/postgres/postgres.git
+
+> cd postgres  
+
+> git checkout REL_1X_STABLE
+
+> ./configure
+
+> cd contrib
+
+> git clone https://github.com/ng-galien/pldebugger.git
+
+> cd pldebugger/
+
+> git checkout print-vars
+
+## Install debugger
+
+> make clean && make USE_PGXS=1 && make USE_PGXS=1 install
+

Makefile

@@ -13,7 +13,7 @@
 EXTENSION  = pldbgapi
 MODULE_big = plugin_debugger
 
-OBJS	   = plpgsql_debugger.o plugin_debugger.o dbgcomm.o pldbgapi.o
+OBJS	   = plpgsql_var.o plpgsql_debugger.o plugin_debugger.o dbgcomm.o pldbgapi.o
 ifdef INCLUDE_PACKAGE_SUPPORT
 OBJS += spl_debugger.o
 endif

docker/Dockerfile

@@ -0,0 +1,33 @@
+# Filename: Dockerfile
+
+#POSTGRES IMAGE 
+ARG BASE_IMAGE=latest
+FROM postgres:${BASE_IMAGE}
+
+# SET ENV
+ARG TAG
+ENV PG_LIB=postgresql-server-dev-${TAG}
+ENV PG_BRANCH=REL_${TAG}_STABLE
+ENV PLUGIN_BRANCH=print-vars
+
+# APT
+RUN apt --yes update \
+    && apt --yes upgrade \
+    && apt --yes install git build-essential libreadline-dev zlib1g-dev bison libkrb5-dev flex libicu-dev pkg-config $PG_LIB \
+    && cd /usr/src/ \
+    && git clone --progress -b $PG_BRANCH --single-branch https://github.com/postgres/postgres.git \
+    && cd postgres \
+    && ./configure \
+    && cd /usr/src/postgres/contrib \ 
+    && git clone -b $PLUGIN_BRANCH --single-branch https://github.com/ng-galien/pldebugger.git \
+    && cd pldebugger \
+    && make clean && make USE_PGXS=1 && make USE_PGXS=1 install \
+    && rm -r /usr/src/postgres \
+    && apt --yes remove --purge git build-essential libreadline-dev zlib1g-dev bison libkrb5-dev flex libicu-dev pkg-config $PG_LIB \
+    && apt --yes autoremove  \
+    && apt --yes clean
+
+# CONFIG
+COPY *.sql /docker-entrypoint-initdb.d/
+COPY *.sh /docker-entrypoint-initdb.d/
+RUN chmod a+r /docker-entrypoint-initdb.d/*

docker/README.md

@@ -0,0 +1,25 @@
+# Docker Image
+
+## Build the image
+
+### Environment variables
+
+
+* PG_VERSION: PostgreSQL version (from 11 to 16)
+* PG_PLATFORM: Target platform, tested on linux/amd64 and linux/arm64 (arm64 is supported from PostgreSQL 14)
+* BASE_IMAGE: Image name (11-bookworm, ...)
+
+
+```bash
+export PG_PLATFORM=linux/arm64 \
+&& PG_VERSION=16 \
+&& export PG_IMAGE=postgres-debugger \
+&& export DOCKER_USER=galien0xffffff \
+&& export BASE_IMAGE="16-bookworm" 
+```
+
+### With buildx
+
+```bash
+docker buildx build --platform $PG_PLATFORM --build-arg "TAG=$PG_VERSION" --build-arg "BASE_IMAGE=$BASE_IMAGE" -t "$DOCKER_USER/$PG_IMAGE:$PG_VERSION" .
+```

docker/config.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'plugin_debugger'/g" /var/lib/postgresql/data/postgresql.conf

plpgsql_debugger.c

@@ -25,7 +25,12 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
+#include "utils/lsyscache.h"
+#include "utils/datum.h"
+#include "utils/rel.h"
 #include "miscadmin.h"
+#include "funcapi.h"
+#include "parser/parse_type.h"
 
 #if INCLUDE_PACKAGE_SUPPORT
 #include "spl.h"
@@ -35,6 +40,7 @@
 #endif
 
 #include "pldebugger.h"
+#include "plpgsql_var.h"
 
 /* Include header for GETSTRUCT */
 #if (PG_VERSION_NUM >= 90300)
@@ -77,6 +83,8 @@ typedef struct
 #endif
 } dbg_ctx;
 
+#define NULL_DATUM "NULL"
+
 static void 		 dbg_startup( PLpgSQL_execstate * estate, PLpgSQL_function * func );
 static void 		 dbg_newstmt( PLpgSQL_execstate * estate, PLpgSQL_stmt * stmt );
 static void 		 initialize_plugin_info( PLpgSQL_execstate * estate, PLpgSQL_function * func );
@@ -298,82 +306,95 @@ varIsArgument(const PLpgSQL_execstate *estate, PLpgSQL_function *func,
 static void
 plpgsql_send_vars(ErrorContextCallback *frame)
 {
-	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) frame->arg;
-	dbg_ctx * dbg_info = (dbg_ctx *) estate->plugin_info;
-	int       i;
+
+	PLpgSQL_datum		*datum;
+	PLpgSQL_variable 	*variable;
+
+	Datum 				datum_value;
+	Oid					typeid;
+	int32 				typetypmod;
+	bool 				isNull;
+	bool		  		isArg;
+	int       			i;
+	StringInfo 			nameString;
+	StringInfo 			valueString;
+	PLpgSQL_datum_type 	datumType;
+
+	PLpgSQL_execstate 	*estate = (PLpgSQL_execstate *) frame->arg;
+	dbg_ctx 			*dbg_info = (dbg_ctx *) estate->plugin_info;
 
 	for( i = 0; i < estate->ndatums; i++ )
 	{
 		if( is_var_visible( estate, i ))
 		{
-			switch( estate->datums[i]->dtype )
+			isNull = true;
+			datum = (PLpgSQL_datum*) estate->datums[i];
+			variable = (PLpgSQL_variable*) estate->datums[i];
+			isArg = dbg_info->func->fn_nargs > 0 && i < dbg_info->func->fn_nargs; 
+			datumType = estate->datums[i]->dtype;
+			switch( datumType )
 			{
 #if (PG_VERSION_NUM >= 110000)
 				case PLPGSQL_DTYPE_PROMISE:
 #endif
 				case PLPGSQL_DTYPE_VAR:
-				{
-					PLpgSQL_var * var = (PLpgSQL_var *) estate->datums[i];
-					char        * val;
-					char		* name = var->refname;
-					bool		  isArg;
-
-					isArg = varIsArgument(estate, dbg_info->func, i, &name);
-
-					if( datumIsNull((PLpgSQL_datum *)var ))
-						val = "NULL";
-					else
-						val = get_text_val( var, NULL, NULL );
-
-					dbg_send( "%s:%c:%d:%c:%c:%c:%d:%s",
-							  name,
-							  isArg ? 'A' : 'L',
-							  var->lineno,
-							  dbg_info->symbols[i].duplicate_name ? 'f' : 't',
-							  var->isconst ? 't':'f',
-							  var->notnull ? 't':'f',
-							  var->datatype ? var->datatype->typoid : InvalidOid,
-							  val );
-
-					break;
-				}
 #if 0
-			FIXME: implement other types
-
-				case PLPGSQL_DTYPE_REC:
-				{
-					PLpgSQL_rec * rec = (PLpgSQL_rec *) estate->datums[i];
-					int		      att;
-					char        * typeName;
-
-					if (rec->tupdesc != NULL)
-					{
-						for( att = 0; att < rec->tupdesc->natts; ++att )
-						{
-							typeName = SPI_gettype( rec->tupdesc, att + 1 );
-
-							dbg_send( "o:%s.%s:%d:%d:%d:%d:%s\n",
-									  rec->refname, NameStr( rec->tupdesc->attrs[att]->attname ),
-									  0, rec->lineno, 0, rec->tupdesc->attrs[att]->attnotnull, typeName ? typeName : "" );
-
-							if( typeName )
-								pfree( typeName );
-						}
-					}
-					break;
-				}
-#endif
 				case PLPGSQL_DTYPE_ROW:
+#endif
+#if (PG_VERSION_NUM >= 130000)
 				case PLPGSQL_DTYPE_REC:
 				case PLPGSQL_DTYPE_RECFIELD:
+#endif
+
 #if (PG_VERSION_NUM < 140000)
 				case PLPGSQL_DTYPE_ARRAYELEM:
 #endif
 #if (PG_VERSION_NUM < 110000)
 				case PLPGSQL_DTYPE_EXPR:
 #endif
 				{
-					/* FIXME: implement other types */
+
+					exec_eval_datum(estate, datum, &typeid, &typetypmod, &datum_value, &isNull);
+
+					valueString = makeStringInfo();
+					nameString = makeStringInfo();
+
+					if (isNull)
+					{
+						appendStringInfoString(valueString, NULL_DATUM);
+					} 
+					else 
+					{
+						print_datum(valueString, estate, datum_value, typeid);
+					}
+
+					if (datumType == PLPGSQL_DTYPE_RECFIELD)
+					{
+						appendStringInfo(nameString, "%s.%s", 
+							((PLpgSQL_rec *) (estate->datums[((PLpgSQL_recfield *) datum)->recparentno]))->refname, 
+							variable->refname);
+					}
+					else 
+					{
+						appendStringInfoString(nameString, variable->refname);
+					}
+
+					dbg_send("%s:%c:%d:%c:%c:%c:%d:%s",
+						nameString->data,
+						isArg ? 'A' : 'L',
+						variable->lineno,
+						dbg_info->symbols[i].duplicate_name ? 'f' : 't',
+						variable->isconst ? 't':'f',
+						variable->notnull ? 't':'f',
+						typeid,
+						valueString->data);
+
+					pfree(valueString);
+					pfree(nameString);
+
+					break;
+				}
+				default: {
 					break;
 				}
 			}
@@ -1531,3 +1552,4 @@ datumIsNull(PLpgSQL_datum *datum)
 
 	return false;
 }
+