Merge pull request #24 from rustprooflabs/pg14

Add Postgres 14 support

Author: rustprooflabs

ADVANCED-INSTALL.md

@@ -194,6 +194,13 @@ Another option to try.
 cargo clean
 ```
 
+If you're doing the above, you probably should remove the `Cargo.lock`
+file while you're at it.
+
+```bash
+rm Cargo.lock
+```
+
 
 ## Non-standard In Docker
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pgdd"
-version = "0.4.0-dev"
+version = "0.4.0-rc4"
 edition = "2018"
 description = "In-database (PostgreSQL) data dictionary providing database introspection via standard SQL query syntax."
 
@@ -10,11 +10,12 @@ crate-type = ["cdylib", "rlib"]
 #crate-type = ["cdylib"]
 
 [features]
-default = ["pg13"]
+default = ["pg14"]
 pg10 = ["pgx/pg10"]
 pg11 = ["pgx/pg11"]
 pg12 = ["pgx/pg12"]
 pg13 = ["pgx/pg13"]
+pg14 = ["pgx/pg14"]
 pg_test = []
 
 [dependencies]

README.md

@@ -9,7 +9,7 @@ The extension is built on the Rust [pgx framework](https://github.com/zombodb/pg
 
 ## Compatibility
 
-PgDD has been tested to work for PostgreSQL 10 through 13.
+PgDD has been tested to work for PostgreSQL 10 through 14.
 
 
 ## Upgrading from <= v0.3
@@ -54,9 +54,9 @@ Binaries are available for Ubuntu 20.04 (bionic) and Ubuntu 21.04 (hirsute).
 Download and install.
 
 ```bash
-wget https://github.com/rustprooflabs/pgdd/releases/download/0.4.0.rc3/pgdd_0.4.0.rc3_focal_pg13_amd64.deb
+wget https://github.com/rustprooflabs/pgdd/releases/download/0.4.0-rc4/pgdd_0.4.0-rc4_focal_pg13_amd64.deb
 
-sudo dpkg -i ./pgdd_0.4.0.rc3_focal_pg13_amd64.deb
+sudo dpkg -i ./pgdd_0.4.0-rc4_focal_pg13_amd64.deb
 ```
 
 In your database.
@@ -79,7 +79,7 @@ SELECT extname, extversion
 ┌─────────┬────────────┐
 │ extname │ extversion │
 ╞═════════╪════════════╡
-│ pgdd    │ 0.4.0.rc3  │
+│ pgdd    │ 0.4.0-rc4  │
 └─────────┴────────────┘
 ```
 

build/build.sh

@@ -23,8 +23,8 @@ LOGDIR=${BASE}/target/logs
 ARTIFACTDIR=${BASE}/target/artifacts
 PGXVERSION=0.2.0-beta.1
 
-PG_VERS=("pg10" "pg11" "pg12" "pg13")
-#PG_VERS=("pg13")
+PG_VERS=("pg10" "pg11" "pg12" "pg13" "pg14")
+#PG_VERS=("pg14")
 
 echo $BASE
 echo $VERSION

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make wget curl gnupg git
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
     && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update
+RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y \
         clang-10 llvm-10 clang libz-dev strace pkg-config \
         libxml2 libxml2-dev libreadline8 libreadline-gplv2-dev \
@@ -26,7 +26,8 @@ RUN apt-get install -y \
         postgresql-server-dev-10 \
         postgresql-server-dev-11 \
         postgresql-server-dev-12 \
-        postgresql-server-dev-13
+        postgresql-server-dev-13 \
+        postgresql-server-dev-14
 
 
 RUN gem install --no-document fpm
@@ -49,10 +50,12 @@ RUN /bin/bash rustup.sh -y \
 RUN mkdir -p /home/${USER}/.pgx/data-10 \
     && mkdir /home/${USER}/.pgx/data-11 \
     && mkdir /home/${USER}/.pgx/data-12 \
-    && mkdir /home/${USER}/.pgx/data-13
+    && mkdir /home/${USER}/.pgx/data-13 \
+    && mkdir /home/${USER}/.pgx/data-14
 
 RUN cargo pgx init \
     --pg10=/usr/lib/postgresql/10/bin/pg_config \
     --pg11=/usr/lib/postgresql/11/bin/pg_config \
     --pg12=/usr/lib/postgresql/12/bin/pg_config \
-    --pg13=/usr/lib/postgresql/13/bin/pg_config
+    --pg13=/usr/lib/postgresql/13/bin/pg_config \
+    --pg14=/usr/lib/postgresql/14/bin/pg_config

build/docker/pgdd-ubuntu-hirsute/Dockerfile

@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get upgrade -y && apt-get install -y make wget curl gnupg git
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" >> /etc/apt/sources.list.d/pgdg.list \
     && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update
+RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y \
         clang-12 llvm-12 clang libz-dev strace pkg-config \
         libxml2 libxml2-dev libreadline8 libreadline-dev \
@@ -26,7 +26,8 @@ RUN apt-get install -y \
         postgresql-server-dev-10 \
         postgresql-server-dev-11 \
         postgresql-server-dev-12 \
-        postgresql-server-dev-13
+        postgresql-server-dev-13 \
+        postgresql-server-dev-14
 
 
 RUN gem install --no-document fpm
@@ -49,10 +50,12 @@ RUN /bin/bash rustup.sh -y \
 RUN mkdir -p /home/${USER}/.pgx/data-10 \
     && mkdir /home/${USER}/.pgx/data-11 \
     && mkdir /home/${USER}/.pgx/data-12 \
-    && mkdir /home/${USER}/.pgx/data-13
+    && mkdir /home/${USER}/.pgx/data-13 \
+    && mkdir /home/${USER}/.pgx/data-14
 
 RUN cargo pgx init \
     --pg10=/usr/lib/postgresql/10/bin/pg_config \
     --pg11=/usr/lib/postgresql/11/bin/pg_config \
     --pg12=/usr/lib/postgresql/12/bin/pg_config \
-    --pg13=/usr/lib/postgresql/13/bin/pg_config
+    --pg13=/usr/lib/postgresql/13/bin/pg_config \
+    --pg14=/usr/lib/postgresql/14/bin/pg_config

pgdd.control

@@ -1,5 +1,5 @@
 comment = 'An in-database data dictionary providing database introspection via standard SQL query syntax.  Developed using pgx (https://github.com/zombodb/pgx).'
-default_version = '0.4.0.rc3'
+default_version = '0.4.0-rc4'
 module_pathname = '$libdir/pgdd'
 relocatable = false
 schema = dd

src/lib.rs

@@ -77,7 +77,7 @@ fn columns(
 {
     #[cfg(any(feature = "pg10", feature="pg11"))]
     let query = include_str!("sql/function_query/columns-pre-12.sql");
-    #[cfg(any(feature = "pg12", feature="pg13"))]
+    #[cfg(any(feature = "pg12", feature="pg13", feature="pg14"))]
     let query = include_str!("sql/function_query/columns-12.sql");
 
     let mut results = Vec::new();