Preparing for release

Author: rustprooflabs

ADVANCED-INSTALL.md

@@ -36,7 +36,7 @@ Install `cargo-pgx` regularly (see dev steps below for non-standard install).
 
 
 ```bash
-cargo install cargo-pgx
+cargo install --locked cargo-pgx
 ```
 
 
@@ -117,7 +117,7 @@ CREATE EXTENSION pgdd;
 ## Build binary packages
 
 Debian/Ubuntu Bionic binaries are available for 0.4.0
-(first [pgx](https://github.com/zombodb/pgx) version)
+(first [pgx](https://github.com/tcdi/pgx) version)
 and later.  More distributions will likely have binaries available in the future.
 
 
@@ -149,15 +149,15 @@ dot -Goverlap=prism -Gspline=ortho -Tjpg pgdd.dot > pgdd.jpg
 When working against Pgx installed from a non-tagged branch, install pgx using:
 
 ```bash
-cargo install --force --git "https://github.com/zombodb/pgx" \
+cargo install --locked --force --git "https://github.com/tcdi/pgx" \
     --branch "develop" \
     "cargo-pgx"
 ```
 
 Or a beta branch
 
 ```bash
-cargo install --force cargo-pgx --version 0.2.0-beta.4
+cargo install --locked --force cargo-pgx --version 0.2.0-beta.4
 ```
 
 Changes to `Cargo.toml` required in `[lib]` and `[dependencies]` sections.
@@ -174,16 +174,16 @@ crate-type = ["cdylib", "rlib"]
 ```toml
 [dependencies]
 
-pgx = { git = "https://github.com/zombodb/pgx", branch = "oh-no-type-resolution" }
-pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx = { git = "https://github.com/tcdi/pgx", branch = "oh-no-type-resolution" }
+pgx-macros = { git = "https://github.com/tcdi/pgx", branch = "develop" }
 #pgx = "0.1.21"
 #pgx-macros = "0.1.21"
 
 # Won't be needed in final version (hopefully!)
-pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx-utils = { git = "https://github.com/tcdi/pgx", branch = "develop" }
 
 [dev-dependencies]
-pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx-tests = { git = "https://github.com/tcdi/pgx", branch = "develop" }
 #pgx-tests = "0.1.21"
 ```
 
@@ -222,14 +222,14 @@ Change
 
 ```bash
 RUN /bin/bash rustup.sh -y \
-    && cargo install cargo-pgx
+    && cargo install --locked cargo-pgx
 ```
 
 To
 
 ```bash
 RUN /bin/bash rustup.sh -y \
-    && cargo install --force --git "https://github.com/zombodb/pgx" \
+    && cargo install --locked --force --git "https://github.com/tcdi/pgx" \
         --branch "develop" \
         "cargo-pgx"
 ```

Cargo.toml

@@ -8,27 +8,27 @@ description = "In-database (PostgreSQL) data dictionary providing database intro
 crate-type = ["cdylib"]
 
 [features]
-default = ["pg14"]
-pg10 = ["pgx/pg10"]
+default = ["pg15"]
 pg11 = ["pgx/pg11"]
 pg12 = ["pgx/pg12"]
 pg13 = ["pgx/pg13"]
 pg14 = ["pgx/pg14"]
+pg15 = ["pgx/pg15"]
 pg_test = []
 
 [dependencies]
 
 #pgx = { git = "https://github.com/zombodb/pgx", branch = "develop" }
 #pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-pgx = "0.4.5"
-pgx-macros = "0.4.5"
+pgx = "=0.6.0"
+pgx-macros = "=0.6.0"
 
 #pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-pgx-utils = "0.4.5"
+pgx-utils = "=0.6.0"
 
 [dev-dependencies]
 #pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-pgx-tests = "0.4.5"
+pgx-tests = "=0.6.0"
 
 
 [profile.dev]

build/build.sh

@@ -21,10 +21,10 @@ BASE=$(dirname `pwd`)
 VERSION=$(cat $BASE/pgdd.control | grep default_version | cut -f2 -d\')
 LOGDIR=${BASE}/target/logs
 ARTIFACTDIR=${BASE}/target/artifacts
-PGXVERSION=0.4.5
+PGXVERSION=0.6.0
 
-PG_VERS=("pg10" "pg11" "pg12" "pg13" "pg14")
-#PG_VERS=("pg14")
+PG_VERS=("pg11" "pg12" "pg13" "pg14" "pg15")
+#PG_VERS=("pg15")
 
 echo $BASE
 echo $VERSION
@@ -35,7 +35,8 @@ echo "PGX Version: ${PGXVERSION}"
 mkdir -p ${LOGDIR}
 mkdir -p ${ARTIFACTDIR}
 
-for image in `ls docker/ ` ; do
+
+for image in `ls docker/  ` ; do
 
     OS_DIST=$(echo ${image}|cut -f2 -d-)
     OS_VER=$(echo ${image}|cut -f3 -d-)

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -25,11 +25,11 @@ RUN apt-get install -y --fix-missing \
         libldap-dev libkrb5-dev gettext tcl-tclreadline tcl-dev libperl-dev \
         libpython3-dev libprotobuf-c-dev libprotobuf-dev gcc \
         ruby ruby-dev rubygems \
-        postgresql-server-dev-10 \
-        postgresql-server-dev-11 \
-        postgresql-server-dev-12 \
-        postgresql-server-dev-13 \
-        postgresql-server-dev-14 \
+        postgresql-11 postgresql-server-dev-11 \
+        postgresql-12 postgresql-server-dev-12 \
+        postgresql-13 postgresql-server-dev-13 \
+        postgresql-14 postgresql-server-dev-14 \
+        postgresql-15 postgresql-server-dev-15 \
     && apt autoremove -y
 
 
@@ -43,4 +43,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
 ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 
 RUN /bin/bash rustup.sh -y \
-    && cargo install cargo-pgx --version ${PGXVERSION}
+    && cargo install --locked cargo-pgx --version ${PGXVERSION}

build/docker/pgdd-ubuntu-jammy/Dockerfile

@@ -1,6 +1,6 @@
 # Borrowed heavily from https://github.com/zombodb/zombodb/blob/master/build/package.sh
 #
-# Copyright 2021 RustProof Labs
+# Copyright 2021-2022 RustProof Labs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,8 +27,12 @@ fi
 
 PKG_FORMAT=deb
 
-echo "    Running pgx init for ${PG_VER}"
-$(cargo pgx init --${PG_VER} download)
+PG_VER_SHORT=${PG_VER: -2}
+echo "    Running pgx init for ${PG_VER} (${PG_VER_SHORT})"
+
+mkdir -p /home/docker/.pgx/data-${PG_VER_SHORT} 
+
+cargo pgx init --${PG_VER} /usr/lib/postgresql/${PG_VER_SHORT}/bin/pg_config
 
 echo "Changing to build dir..."
 cd /build