Reorganized repository structure (#77)

Reorganized structure of repository to make managing of files easier for the build process. Adapted from methods used in https://github.com/pgpartman/pg_partman. Updates moved into `updates` folder C code moved into `src` folder SQL code moved into `sql` folder Moved test sql script into `test` folder and renamed for clarity compared to the extension core code file Removed testing for versions of PostgreSQL no longer in community support
pgaudit · Jan 25, 2023 · 35e9f3f · 35e9f3f
1 parent 5dc1397
commit 35e9f3f
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 107 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -11,4 +11,4 @@ WORKDIR /src/set_user
 RUN apt-get update && \
 	apt-get -y upgrade && \
 	apt-get -y install postgresql-server-dev-${DEVPKG} make gcc
-RUN make USE_PGXS=1 install
+RUN make install
diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgver: [9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15]
+        pgver: [12, 13, 14, 15]
 
     steps:
       - name: Checkout set_user repo

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ results
 
 # Generated documentation
 *.pdf
+
+# Generated extension file
+extension/set_user--*.sql
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -0,0 +1,11 @@
+4.0.1
+
+NEW FEATURES
+============
+ - Reorganized repository structure to allow for easier management of extension files during build process.
+ - Added NO_PGXS build flag to allow building of extension without PGXS. Restores ability to build on Windows.
+ - No changes to extension code.
+
+BUGFIXES
+========
+ - None
diff --git a/Makefile b/Makefile
@@ -1,20 +1,26 @@
-MODULES = set_user
-
 EXTENSION = set_user
-DATA = set_user--3.0.sql set_user--2.0--3.0.sql set_user--1.6--2.0.sql set_user--1.5--1.6.sql set_user--1.4--1.5.sql set_user--1.1--1.4.sql set_user--1.0--1.1.sql set_user--4.0.0rc1--4.0.0.sql set_user--4.0.0.sql set_user--3.0--4.0.0.sql
+EXTVERSION = $(shell grep default_version $(EXTENSION).control | \
+               sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
+LDFLAGS_SL += $(filter -lm, $(LIBS))
+MODULES = src/set_user
+PG_CONFIG = pg_config
 PGFILEDESC = "set_user - similar to SET ROLE but with added logging"
-
 REGRESS = set_user
 
-LDFLAGS_SL += $(filter -lm, $(LIBS))
+all: extension/$(EXTENSION)--$(EXTVERSION).sql
+
+extension/$(EXTENSION)--$(EXTVERSION).sql: extension/set_user.sql
+	cat $^ > $@
+
+DATA = $(wildcard updates/*--*.sql) extension/$(EXTENSION)--$(EXTVERSION).sql
+EXTRA_CLEAN = extension/$(EXTENSION)--$(EXTVERSION).sql
 
 ifdef NO_PGXS
 subdir = contrib/set_user
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 else
-PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 endif
@@ -25,7 +31,7 @@ install: install-headers
 
 install-headers:
 	$(MKDIR_P) "$(DESTDIR)$(includedir)"
-	$(INSTALL_DATA) "set_user.h" "$(DESTDIR)$(includedir)"
+	$(INSTALL_DATA) "src/set_user.h" "$(DESTDIR)$(includedir)"
 
 uninstall: uninstall-headers
 

diff --git a/set_user--4.0.0.sql → extension/set_user.sql b/set_user--4.0.0.sql → extension/set_user.sql
diff --git a/set_user--1.6.sql b/set_user--1.6.sql
diff --git a/set_user--3.0.sql b/set_user--3.0.sql
diff --git a/set_user.control b/set_user.control
@@ -1,5 +1,5 @@
 # set_user extension
 comment = 'similar to SET ROLE but with added logging'
-default_version = '4.0.0'
+default_version = '4.0.1'
 module_pathname = '$libdir/set_user'
 relocatable = false
diff --git a/compatibility.h → src/compatibility.h b/compatibility.h → src/compatibility.h
diff --git a/set_user.c → src/set_user.c b/set_user.c → src/set_user.c
diff --git a/set_user.h → src/set_user.h b/set_user.h → src/set_user.h
diff --git a/set_user--1.0--1.1.sql → updates/set_user--1.0--1.1.sql b/set_user--1.0--1.1.sql → updates/set_user--1.0--1.1.sql
diff --git a/set_user--1.1--1.4.sql → updates/set_user--1.1--1.4.sql b/set_user--1.1--1.4.sql → updates/set_user--1.1--1.4.sql
diff --git a/set_user--1.4--1.5.sql → updates/set_user--1.4--1.5.sql b/set_user--1.4--1.5.sql → updates/set_user--1.4--1.5.sql
diff --git a/set_user--1.5--1.6.sql → updates/set_user--1.5--1.6.sql b/set_user--1.5--1.6.sql → updates/set_user--1.5--1.6.sql
diff --git a/set_user--1.6--2.0.sql → updates/set_user--1.6--2.0.sql b/set_user--1.6--2.0.sql → updates/set_user--1.6--2.0.sql
diff --git a/set_user--2.0--3.0.sql → updates/set_user--2.0--3.0.sql b/set_user--2.0--3.0.sql → updates/set_user--2.0--3.0.sql
diff --git a/set_user--3.0--4.0.0.sql → updates/set_user--3.0--4.0.0.sql b/set_user--3.0--4.0.0.sql → updates/set_user--3.0--4.0.0.sql
diff --git a/set_user--3.0--4.0.0rc1.sql → updates/set_user--3.0--4.0.0rc1.sql b/set_user--3.0--4.0.0rc1.sql → updates/set_user--3.0--4.0.0rc1.sql
diff --git a/updates/set_user--4.0.0--4.0.1.sql b/updates/set_user--4.0.0--4.0.1.sql
@@ -0,0 +1,6 @@
+/* set-user--4.0.0--4.0.1.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION set_user UPDATE" to load this file. \quit
+
+-- just bumping our version to 4.0.1. no new SQL features here, so nothing to do.
diff --git a/set_user--4.0.0rc1--4.0.0.sql → updates/set_user--4.0.0rc1--4.0.0.sql b/set_user--4.0.0rc1--4.0.0.sql → updates/set_user--4.0.0rc1--4.0.0.sql
diff --git a/set_user--4.0.0rc1.sql → updates/set_user--4.0.0rc1.sql b/set_user--4.0.0rc1.sql → updates/set_user--4.0.0rc1.sql