Support Postgres 18beta1

.github/workflows/tests.yml

@@ -107,7 +107,7 @@ jobs:
 
     strategy:
       matrix:
-        postgres: [ 13, 14, 15, 16, 17 ]
+        postgres: [ 13, 14, 15, 16, 17, 18 ]
         include:
           - postgres: 16
             rust: "beta"
@@ -262,87 +262,19 @@ jobs:
             --package pgrx-tests --test ui
 
 
-      - name: Run aggregate example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/aggregate/Cargo.toml --features "pg$PG_VER" --no-default-features
-
-      - name: Run arrays example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/arrays/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run bad_ideas example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/bad_ideas/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run bgworker example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/bgworker/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run bytea example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/bytea/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run composite_type example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/composite_type/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run custom_libname example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/custom_libname/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run custom_types example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/custom_types/Cargo.toml  --features "pg$PG_VER" --no-default-features
+      - name: Run all example tests
+        run: |
+          for example in $(find pgrx-examples -name Cargo.toml | cut -d/ -f2 | sort); do
+            echo "Running tests for $example"
+            CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/$example/Cargo.toml  --features "pg$PG_VER" --no-default-features
+          done
 
       - name: Run custom_types without schema generation example tests
         run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/custom_types/Cargo.toml  --features "pg$PG_VER no-schema-generation" --no-default-features
 
-      - name: Run custom_sql example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/custom_sql/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run datetime example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/datetime/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run errors example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/errors/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run nostd example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/nostd/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run numeric example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/numeric/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run pgtrybuilder example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/pgtrybuilder/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run operators example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/operators/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run range example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/range/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
       - name: Run range example regression tests
         run: CARGO_TARGET_DIR="$(pwd)/target" cargo pgrx regress pg$PG_VER --manifest-path=pgrx-examples/range/Cargo.toml
 
-      - name: Run schemas example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/schemas/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run shmem example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/shmem/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run spi example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/spi/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run spi_srf example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/spi_srf/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run srf example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/srf/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run strings example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/strings/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run triggers example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/triggers/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run versioned_custom_libname_so example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/versioned_custom_libname_so/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
-      - name: Run versioned_so example tests
-        run: CARGO_TARGET_DIR="$(pwd)/target" cargo test --manifest-path=pgrx-examples/versioned_so/Cargo.toml  --features "pg$PG_VER" --no-default-features
-
       - name: Run `cargo pgrx schema` against the versioned_custom_libname_so example
         run: cd pgrx-examples/versioned_custom_libname_so && cargo pgrx schema pg$PG_VER
 

.github/workflows/will-it-blend-develop.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false # We want all of them to run, even if one fails
       matrix:
-        pg_version: [ "pg13", "pg14", "pg15", "pg16", "pg17" ]
+        pg_version: [ "pg13", "pg14", "pg15", "pg16", "pg17", "pg18" ]
         container: [ "fedora", "debian_bullseye", "alpine" ]
     steps:
       - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false # We want all of them to run, even if one fails
       matrix:
-        pg_version: [ "pg13", "pg14", "pg15", "pg16", "pg17" ]
+        pg_version: [ "pg13", "pg14", "pg15", "pg16", "pg17", "pg18" ]
         container: [ "debian_bullseye" ]
     steps:
       # See above for logic details here

README.md

@@ -13,7 +13,7 @@
 
 `pgrx` is a framework for developing PostgreSQL extensions in Rust and strives to be as idiomatic and safe as possible.
 
-`pgrx` supports Postgres 13 through Postgres 17.
+`pgrx` supports Postgres 13 through Postgres 18.
 
 ## Want to chat with us or get a question answered?
 

cargo-pgrx/README.md

@@ -337,7 +337,7 @@ Compile/install extension to a pgrx-managed Postgres instance and start psql
 Usage: cargo pgrx run [OPTIONS] [PG_VERSION] [DBNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, or pg17? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18? [env: PG_VERSION=]
   [DBNAME]      The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name
 
 Options:
@@ -388,7 +388,7 @@ Connect, via psql, to a Postgres instance
 Usage: cargo pgrx connect [OPTIONS] [PG_VERSION] [DBNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, or pg17? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18? [env: PG_VERSION=]
   [DBNAME]      The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name [env: DBNAME=]
 
 Options:
@@ -506,7 +506,7 @@ Run the test suite for this crate
 Usage: cargo pgrx test [OPTIONS] [PG_VERSION] [TESTNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, pg17, or all? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, pg17, pg18, or all? [env: PG_VERSION=]
   [TESTNAME]    If specified, only run tests containing this string in their names
 
 Options:
@@ -828,7 +828,7 @@ Generate extension schema files
 Usage: cargo pgrx schema [OPTIONS] [PG_VERSION]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, or pg17?
+  [PG_VERSION]  Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18?
 
 Options:
   -p, --package <PACKAGE>              Package to build (see `cargo help pkgid`)

cargo-pgrx/src/command/connect.rs

@@ -22,7 +22,7 @@ use std::path::PathBuf;
 #[derive(clap::Args, Debug)]
 #[clap(author)]
 pub(crate) struct Connect {
-    /// Do you want to run against pg13, pg14, pg15, pg16, or pg17?
+    /// Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name

cargo-pgrx/src/command/init.rs

@@ -61,6 +61,9 @@ pub(crate) struct Init {
     /// If installed locally, the path to PG17's `pgconfig` tool, or `download` to have pgrx download/compile/install it
     #[clap(env = "PG17_PG_CONFIG", long)]
     pg17: Option<String>,
+    /// If installed locally, the path to PG18's `pgconfig` tool, or `download` to have pgrx download/compile/install it
+    #[clap(env = "PG18_PG_CONFIG", long)]
+    pg18: Option<String>,
     #[clap(from_global, action = ArgAction::Count)]
     verbose: u8,
     #[clap(long, help = "Base port number")]
@@ -118,6 +121,9 @@ impl CommandExecute for Init {
         if let Some(ref version) = self.pg17 {
             versions.insert("pg17", version.clone());
         }
+        if let Some(ref version) = self.pg18 {
+            versions.insert("pg18", version.clone());
+        }
 
         if versions.is_empty() {
             // no arguments specified, so we'll just install our defaults

cargo-pgrx/src/command/run.rs

@@ -25,7 +25,7 @@ use std::path::{Path, PathBuf};
 #[derive(clap::Args, Debug)]
 #[clap(author)]
 pub(crate) struct Run {
-    /// Do you want to run against pg13, pg14, pg15, pg16, or pg17?
+    /// Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name

cargo-pgrx/src/command/schema.rs

@@ -34,7 +34,7 @@ pub(crate) struct Schema {
     /// Build in test mode (for `cargo pgrx test`)
     #[clap(long)]
     test: bool,
-    /// Do you want to run against pg13, pg14, pg15, pg16, or pg17?
+    /// Do you want to run against pg13, pg14, pg15, pg16, pg17, or pg18?
     pg_version: Option<String>,
     /// Compile for release mode (default is debug)
     #[clap(long, short)]

cargo-pgrx/src/command/start.rs

@@ -22,7 +22,7 @@ use std::process::Stdio;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Start {
-    /// The Postgres version to stop (pg13, pg14, pg15, pg16, pg17, or all)
+    /// The Postgres version to stop (pg13, pg14, pg15, pg16, pg17, pg18, or all)
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     #[clap(from_global, action = ArgAction::Count)]

cargo-pgrx/src/command/stop.rs

@@ -20,7 +20,7 @@ use std::process::Stdio;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Stop {
-    /// The Postgres version to stop (pg13, pg14, pg15, pg16, pg17, or all)
+    /// The Postgres version to stop (pg13, pg14, pg15, pg16, pg17, pg18, or all)
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     #[clap(from_global, action = ArgAction::Count)]

cargo-pgrx/src/command/test.rs

@@ -20,7 +20,7 @@ use crate::CommandExecute;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Test {
-    /// Do you want to run against pg13, pg14, pg15, pg16, pg17, or all?
+    /// Do you want to run against pg13, pg14, pg15, pg16, pg17, pg18, or all?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// If specified, only run tests containing this string in their names

cargo-pgrx/src/templates/bgworker_lib_rs

@@ -2,7 +2,7 @@ use pgrx::bgworkers::*;
 use pgrx::prelude::*;
 use std::time::Duration;
 
-::pgrx::pg_module_magic!();
+::pgrx::pg_module_magic!(c"{name}", pgrx::pg_sys::PG_VERSION);
 
 /*
 In order to use this bgworker with a cargo-pgrx managed database, you'll need to add this line to

cargo-pgrx/src/templates/cargo_toml

@@ -17,6 +17,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16" ]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17" ]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ]
 pg_test = []
 
 [dependencies]

cargo-pgrx/src/templates/lib_rs

@@ -1,6 +1,6 @@
 use pgrx::prelude::*;
 
-::pgrx::pg_module_magic!();
+::pgrx::pg_module_magic!(c"{name}", pgrx::pg_sys::PG_VERSION);
 
 #[pg_extern]
 fn hello_{name}() -> &'static str {{

pgrx-examples/aggregate/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 bob = []
 

pgrx-examples/aggregate/src/lib.rs

@@ -14,7 +14,7 @@ use pgrx::StringInfo;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"aggregate", pgrx::pg_sys::PG_VERSION);
 
 #[derive(Copy, Clone, PostgresType, Serialize, Deserialize)]
 #[pgvarlena_inoutfuncs]

pgrx-examples/arrays/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/arrays/src/lib.rs

@@ -10,7 +10,7 @@
 use pgrx::prelude::*;
 use serde::*;
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"arrays", pgrx::pg_sys::PG_VERSION);
 
 #[pg_extern]
 fn sq_euclid_pgrx(a: Array<f32>, b: Array<f32>) -> f32 {

pgrx-examples/bad_ideas/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/bad_ideas/src/lib.rs

@@ -14,7 +14,7 @@ use std::io::{Read, Write};
 use std::panic::catch_unwind;
 use std::process::Command;
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"bad_ideas", pgrx::pg_sys::PG_VERSION);
 
 #[pg_extern]
 fn panic(s: &str) -> bool {

pgrx-examples/bgworker/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/bgworker/src/lib.rs

@@ -26,7 +26,7 @@ use std::time::Duration;
     this background worker
 */
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"bgworker", pgrx::pg_sys::PG_VERSION);
 
 #[pg_guard]
 pub extern "C-unwind" fn _PG_init() {

pgrx-examples/bytea/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/bytea/src/lib.rs

@@ -11,7 +11,7 @@ use libflate::gzip::{Decoder, Encoder};
 use pgrx::prelude::*;
 use std::io::{Read, Write};
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"bytea", pgrx::pg_sys::PG_VERSION);
 
 /// gzip bytes.  Postgres will automatically convert `text`/`varchar` data into `bytea`
 #[pg_extern]

pgrx-examples/composite_type/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/composite_type/src/lib.rs

@@ -23,7 +23,7 @@ using composite types.
 use pgrx::{opname, pg_operator, prelude::*};
 
 // All `pgrx` extensions will do this:
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"composite_type", pgrx::pg_sys::PG_VERSION);
 
 /* Composite types must be defined either before they are used.
 

pgrx-examples/custom_libname/Cargo.toml

@@ -29,6 +29,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]

pgrx-examples/custom_libname/src/lib.rs

@@ -9,7 +9,7 @@
 //LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
 use pgrx::prelude::*;
 
-::pgrx::pg_module_magic!();
+pgrx::pg_module_magic!(c"custom_libname", pgrx::pg_sys::PG_VERSION);
 
 #[pg_extern]
 fn hello_custom_libname() -> &'static str {

pgrx-examples/custom_sql/Cargo.toml

@@ -28,6 +28,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
+pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
 pg_test = []
 
 [dependencies]