doctest integration and some file rearrangement.

Author: michelp

Dockerfile

@@ -9,6 +9,9 @@ RUN apt-get update && \
 
 # add postgres user and make data dir
 RUN groupadd -r postgres && useradd --no-log-init -r -m -s /bin/bash -g postgres -G sudo postgres
+RUN echo "postgres ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && \
+    chmod 0440 /etc/sudoers.d/user
+    
 ENV PGDATA /home/postgres/data
 RUN /bin/rm -Rf "$PGDATA" && mkdir "$PGDATA"
 WORKDIR "/home/postgres"
@@ -26,7 +29,7 @@ RUN git clone --branch REL_${version}_STABLE https://github.com/postgres/postgre
 RUN chown postgres:postgres /home/postgres
 
 RUN curl -s -L https://github.com/theory/pgtap/archive/v1.2.0.tar.gz | tar zxvf - && cd pgtap-1.2.0 && make && make install
-RUN curl -s -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz | tar zxvf - && cd libsodium-1.0.18 && ./configure && make check && make -j 4 install
+RUN curl -s -L https://github.com/jedisct1/libsodium/releases/download/1.0.20-RELEASE/libsodium-1.0.20.tar.gz | tar zxvf - && cd libsodium-1.0.20 && ./configure && make check && make -j 4 install
 RUN cpan App::cpanminus && cpan TAP::Parser::SourceHandler::pgTAP && cpan App::prove
 
 RUN git clone --depth 1 https://github.com/lacanoid/pgddl.git
@@ -43,7 +46,6 @@ RUN sed -i 's/exit//g' `pg_config --sharedir`/extension/pgsodium_getkey
 RUN chmod +x `pg_config --sharedir`/extension/pgsodium_getkey
 RUN cp `pg_config --sharedir`/extension/pgsodium_getkey /getkey
 
-# chown just pggraphblas
 RUN chown -R postgres:postgres /home/postgres/pgsodium
 RUN chown -R postgres:postgres /home/postgres/data
 

Makefile

@@ -2,16 +2,15 @@
 
 EXTENSION = pgsodium
 PG_CONFIG ?= pg_config
-DATA = $(wildcard sql/*--*.sql)
+DATA = $(wildcard extension/*--*.sql)
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 MODULE_big = pgsodium
 OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
 SHLIB_LINK = -lsodium
 PG_CPPFLAGS = -O0
 
-# TESTS        = $(wildcard test/*.sql)
-# REGRESS      = $(patsubst test/%.sql,%,$(TESTS))
-# REGRESS_OPTS = --inputdir=test --load-language=plpgsql
+TESTS        = $(wildcard sql/*.sql)
+REGRESS      = $(patsubst sql/%.sql,%,$(TESTS))
 include $(PGXS)
 
 dist:

doc-notebook.sh

@@ -0,0 +1,43 @@
+import os
+import sys
+
+
+def process_file(path):
+    with open(path, "r") as f:
+        content = f.read()
+    s = content.lstrip()
+    if not s.startswith("/* doctest"):
+        return
+    end = s.find("*/")
+    if end == -1:
+        return
+    comment = s[: end + 2]
+    lines = comment.splitlines()
+    if not lines:
+        return
+    first = lines[0]
+    if not first.startswith("/* doctest"):
+        return
+    target = first[len("/* doctest"):].strip()
+    if target.startswith("/"):
+        target = target[1:]
+    if not target:
+        return
+    target = target.replace('/', '_')
+    stripped_comment = "\n".join(lines[1:-1]).strip() if len(lines) >= 3 else ""
+    out_file = os.path.join("sql", target + ".sql")
+    os.makedirs(os.path.dirname(out_file), exist_ok=True)
+    with open(out_file, "w") as out:
+        out.write(stripped_comment + "\n\n")
+
+
+def main():
+    base = sys.argv[1] if len(sys.argv) > 1 else "."
+    for root, _, files in os.walk(base):
+        for f in files:
+            if f.endswith(".c"):
+                process_file(os.path.join(root, f))
+
+
+if __name__ == "__main__":
+    main()