Postgres 18 support

.devcontainer/Dockerfile

@@ -3,22 +3,23 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND="noninteractive"
 ENV TZ="Europe/Istanbul"
 
-ARG PG_MAJOR=17
+ARG PG_MAJOR=18
 
 # install deps
 RUN apt-get update && apt-get -y install build-essential libreadline-dev zlib1g-dev      \
                                          flex bison libxml2-dev libxslt-dev libssl-dev   \
                                          libxml2-utils xsltproc ccache pkg-config wget   \
                                          curl lsb-release ca-certificates gnupg sudo git \
-                                         nano net-tools awscli
+                                         nano net-tools awscli libkrb5-dev
 
 # install azure-cli
 RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null
 RUN echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ `lsb_release -cs` main" | tee /etc/apt/sources.list.d/azure-cli.list
 RUN apt-get update && apt-get install -y azure-cli
 
 # install Postgres
-RUN sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+RUN sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
+    sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg 18" >> /etc/apt/sources.list.d/pgdg.list'
 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 RUN apt-get update && apt-get -y install postgresql-${PG_MAJOR}-postgis-3  \
                                          postgresql-server-dev-${PG_MAJOR} \
@@ -27,11 +28,17 @@ RUN apt-get update && apt-get -y install postgresql-${PG_MAJOR}-postgis-3  \
 
 # set up permissions so that rust user can create extensions
 RUN chmod a+rwx `pg_config --pkglibdir`          \
+                `pg_config --pkglibdir`/bitcode  \
                 `pg_config --sharedir`/extension \
                 /var/run/postgresql/
 
-# install pgaudit
-RUN apt-get update && apt-get -y install postgresql-${PG_MAJOR}-pgaudit
+# install pgaudit extension
+RUN if [ ${PG_MAJOR} != "18" ]; then \
+      apt-get -y install postgresql-${PG_MAJOR}-pgaudit; \
+    else \
+      git clone --branch integration https://github.com/pgaudit/pgaudit.git /tmp/pgaudit && \
+      cd /tmp/pgaudit && make install USE_PGXS=1 PG_CONFIG=pg_config; \
+    fi
 
 # initdb requires non-root user. This will also be the user that runs the container.
 ARG USERNAME=rust

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
   build-and-test:
     strategy:
       matrix:
-        postgres: [ 14, 15, 16, 17 ]
+        postgres: [ 14, 15, 16, 17, 18 ]
         runs_on: [ 'ubuntu-22.04', 'ubuntu-22.04-arm' ]
         include:
           - runs_on: ubuntu-22.04
@@ -91,24 +91,21 @@ jobs:
           curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
           pipenv install --dev
 
-      - name: Install PostgreSQL
+      - name: Install PostgreSQL and postgis
         run: |
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg 18" >> /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
           sudo apt-get update
           sudo apt-get -y install build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev \
                                   libxslt-dev libssl-dev libxml2-utils xsltproc ccache pkg-config   \
-                                  gnupg ca-certificates
-          sudo apt-get -y install postgresql-${{ env.PG_MAJOR }}-postgis-3 \
+                                  gnupg ca-certificates libkrb5-dev
+          sudo apt-get -y install postgresql-${{ env.PG_MAJOR }}-postgis-3  \
                                   postgresql-server-dev-${{ env.PG_MAJOR }} \
-                                  postgresql-client-${{ env.PG_MAJOR }} \
+                                  postgresql-client-${{ env.PG_MAJOR }}     \
                                   libpq-dev
           echo "export PG_MAJOR=${{ env.PG_MAJOR }}" >> $GITHUB_ENV
 
-      - name: Install pgaudit extension
-        run: |
-          sudo apt-get install -y postgresql-${{ env.PG_MAJOR }}-pgaudit
-
       - name: Install azure-cli
         run: |
           curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /etc/apt/keyrings/microsoft.gpg > /dev/null
@@ -124,27 +121,45 @@ jobs:
 
       - name: Set up permissions for PostgreSQL
         run: |
-          sudo chmod a+rwx $(/usr/lib/postgresql/${{ env.PG_MAJOR }}/bin/pg_config --pkglibdir)          \
-                           $(/usr/lib/postgresql/${{ env.PG_MAJOR }}/bin/pg_config --sharedir)/extension \
+          sudo chmod a+rwx $(${{ env.PG_CONFIG }} --pkglibdir)          \
+                           $(${{ env.PG_CONFIG }} --pkglibdir)/bitcode  \
+                           $(${{ env.PG_CONFIG }} --sharedir)/extension \
                            /var/run/postgresql/
 
+      - uses: actions/checkout@v4
+        if: ${{ env.PG_MAJOR == '18' }}
+        with:
+          repository: 'pgaudit/pgaudit'
+          ref: 'integration'
+          path: pgaudit
+
+      - name: Install pgaudit extension for pg18
+        if: ${{ env.PG_MAJOR == '18' }}
+        run: |
+          cd pgaudit && make install USE_PGXS=1 PG_CONFIG=${{ env.PG_CONFIG }}
+
+      - name: Install pgaudit extension for < pg18
+        if: ${{ env.PG_MAJOR != '18' }}
+        run: |
+          sudo apt-get -y install postgresql-${{ env.PG_MAJOR }}-pgaudit
+
       - name: Check format and lint
         run: |
           make check-format
           make check-lint
 
       - name: Run tests without coverage
-        if: ${{ env.PG_MAJOR != '17' || matrix.arch != 'x86_64' }}
+        if: ${{ env.PG_MAJOR != '18' || matrix.arch != 'x86_64' }}
         run: |
           make check
 
       - name: Run tests with coverage
-        if: ${{ env.PG_MAJOR == '17' && matrix.arch == 'x86_64' }}
+        if: ${{ env.PG_MAJOR == '18' && matrix.arch == 'x86_64' }}
         run: |
           make check-with-coverage
 
       - name: Upload coverage report to Codecov
-        if: ${{ env.PG_MAJOR == '17' && matrix.arch == 'x86_64' }}
+        if: ${{ env.PG_MAJOR == '18' && matrix.arch == 'x86_64' }}
         uses: codecov/codecov-action@v4
         with:
           fail_ci_if_error: true

Cargo.toml

@@ -12,7 +12,8 @@ name = "pgrx_embed_pg_parquet"
 path = "./src/bin/pgrx_embed.rs"
 
 [features]
-default = ["pg17"]
+default = ["pg18"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
@@ -51,6 +52,9 @@ url = "2"
 [dev-dependencies]
 pgrx-tests = "=0.16.0"
 
+[build-dependencies]
+cfg_aliases = "0.2"
+
 [profile.dev]
 panic = "unwind"
 

README.md

@@ -42,7 +42,7 @@ After installing `Postgres`, you need to set up `rustup`, `cargo-pgrx` to build
 
 # set cargo-pgrx (should be the same as pgrx dep in Cargo.toml) and pg versions
 > export CARGO_PGRX_VERSION=0.16.0
-> export PG_MAJOR=17
+> export PG_MAJOR=18
 
 # install cargo-pgrx
 > cargo install --force --locked cargo-pgrx@"${CARGO_PGRX_VERSION}"
@@ -385,3 +385,4 @@ There is currently only one GUC parameter to enable/disable the `pg_parquet`:
 | 15                       |    ✅     |
 | 16                       |    ✅     |
 | 17                       |    ✅     |
+| 18                       |    ✅     |

build.rs

@@ -1,5 +1,7 @@
 use std::process::Command;
 
+use cfg_aliases::cfg_aliases;
+
 fn main() {
     println!("cargo::rustc-check-cfg=cfg(rhel8)");
     let output = Command::new("cat")
@@ -12,4 +14,11 @@ fn main() {
     if os_info.contains("platform:el8") {
         println!("cargo::rustc-cfg=rhel8");
     }
+
+    cfg_aliases! {
+        pre_pg18: { any(feature = "pg14", feature = "pg15", feature = "pg16", feature = "pg17") },
+        pre_pg17: { any(feature = "pg14", feature = "pg15", feature = "pg16") },
+        pre_pg16: { any(feature = "pg14", feature = "pg15")  },
+        pre_pg15: { any(feature = "pg14")  },
+    }
 }

src/parquet_copy_hook/copy_to.rs

@@ -96,7 +96,8 @@ pub(crate) fn execute_copy_to_with_dest_receiver(
             portal.as_ptr(),
             i64::MAX,
             false,
-            true,
+            #[cfg(pre_pg18)]
+            true, // run_once
             parquet_dest.as_ptr(),
             parquet_dest.as_ptr(),
             &mut completion_tag as _,
@@ -214,6 +215,20 @@ fn copy_to_stmt_ensure_table_kind(relation: &PgRelation) {
             "Try the COPY (SELECT ...) TO variant.",
         );
     } else if relation_kind == RELKIND_MATVIEW as c_char {
+        #[cfg(not(pre_pg18))]
+        if !(unsafe { *relation.rd_rel }).relispopulated {
+            ereport!(
+                PgLogLevel::ERROR,
+                PgSqlErrorCode::ERRCODE_FEATURE_NOT_SUPPORTED,
+                format!(
+                    "cannot copy from unpopulated materialized view \"{}\"",
+                    relation.name()
+                ),
+                "Use the REFRESH MATERIALIZED VIEW command.",
+            );
+        }
+
+        #[cfg(pre_pg18)]
         ereport!(
             PgLogLevel::ERROR,
             PgSqlErrorCode::ERRCODE_WRONG_OBJECT_TYPE,

src/parquet_copy_hook/pg_compat.rs

@@ -15,7 +15,7 @@ pub(crate) fn pg_analyze_and_rewrite(
     query_string: *const c_char,
     query_env: *mut QueryEnvironment,
 ) -> *mut List {
-    #[cfg(feature = "pg14")]
+    #[cfg(pre_pg15)]
     unsafe {
         pgrx::pg_sys::pg_analyze_and_rewrite(
             raw_stmt,
@@ -26,7 +26,7 @@ pub(crate) fn pg_analyze_and_rewrite(
         )
     }
 
-    #[cfg(any(feature = "pg15", feature = "pg16", feature = "pg17"))]
+    #[cfg(not(pre_pg15))]
     unsafe {
         pgrx::pg_sys::pg_analyze_and_rewrite_fixedparams(
             raw_stmt,
@@ -40,7 +40,7 @@ pub(crate) fn pg_analyze_and_rewrite(
 
 #[allow(non_snake_case)]
 pub(crate) fn strVal(val: *mut Node) -> String {
-    #[cfg(feature = "pg14")]
+    #[cfg(pre_pg15)]
     unsafe {
         let val = (*(val as *mut pgrx::pg_sys::Value)).val.str_;
 
@@ -50,7 +50,7 @@ pub(crate) fn strVal(val: *mut Node) -> String {
             .to_string()
     }
 
-    #[cfg(any(feature = "pg15", feature = "pg16", feature = "pg17"))]
+    #[cfg(not(pre_pg15))]
     unsafe {
         let val = (*(val as *mut pgrx::pg_sys::String)).sval;
 
@@ -63,20 +63,20 @@ pub(crate) fn strVal(val: *mut Node) -> String {
 
 #[allow(non_snake_case)]
 pub(crate) fn MarkGUCPrefixReserved(guc_prefix: &str) {
-    #[cfg(feature = "pg14")]
+    #[cfg(pre_pg15)]
     unsafe {
         pgrx::pg_sys::EmitWarningsOnPlaceholders(guc_prefix.as_pg_cstr())
     }
 
-    #[cfg(any(feature = "pg15", feature = "pg16", feature = "pg17"))]
+    #[cfg(not(pre_pg15))]
     unsafe {
         pgrx::pg_sys::MarkGUCPrefixReserved(guc_prefix.as_pg_cstr())
     }
 }
 
 /// check_copy_table_permission checks if the user has permission to copy from/to the table.
 /// This is taken from the original PostgreSQL DoCopy function.
-#[cfg(any(feature = "pg16", feature = "pg17"))]
+#[cfg(not(pre_pg16))]
 pub(crate) fn check_copy_table_permission(
     p_stmt: &PgBox<PlannedStmt>,
     p_state: &PgBox<ParseState>,
@@ -134,28 +134,7 @@ pub(crate) fn check_copy_table_permission(
     unsafe { reset_pgaudit(guc_level) };
 }
 
-unsafe fn disable_pgaudit() -> i32 {
-    let guc_level = NewGUCNestLevel();
-
-    set_config_option(
-        "pgaudit.log".as_pg_cstr(),
-        "none".as_pg_cstr(),
-        PGC_SUSET,
-        PGC_S_SESSION,
-        GUC_ACTION_SAVE,
-        true,
-        0,
-        false,
-    );
-
-    guc_level
-}
-
-unsafe fn reset_pgaudit(guc_level: i32) {
-    AtEOXact_GUC(true, guc_level);
-}
-
-#[cfg(any(feature = "pg14", feature = "pg15"))]
+#[cfg(pre_pg16)]
 pub(crate) fn check_copy_table_permission(
     p_stmt: &PgBox<PlannedStmt>,
     p_state: &PgBox<ParseState>,
@@ -198,3 +177,24 @@ pub(crate) fn check_copy_table_permission(
 
     unsafe { reset_pgaudit(guc_level) };
 }
+
+unsafe fn disable_pgaudit() -> i32 {
+    let guc_level = NewGUCNestLevel();
+
+    set_config_option(
+        "pgaudit.log".as_pg_cstr(),
+        "none".as_pg_cstr(),
+        PGC_SUSET,
+        PGC_S_SESSION,
+        GUC_ACTION_SAVE,
+        true,
+        0,
+        false,
+    );
+
+    guc_level
+}
+
+unsafe fn reset_pgaudit(guc_level: i32) {
+    AtEOXact_GUC(true, guc_level);
+}