pg18 support in extension (#261)

Author: ChuckHend

.github/workflows/extension_upgrade.yml

@@ -60,7 +60,7 @@ jobs:
           git checkout tags/v0.20.0
           # pgrx=0.12.5 required for v0.20.0
           cargo install cargo-pgrx --version 0.12.5 --locked
-          cargo pgrx install --pg-config $(cargo pgrx info pg-config pg17)
+          cargo pgrx install --pg-config $(cargo pgrx info pg-config pg18)
           # use integration tests for v0.20.0
           make test-integration
       - name: Test branch's version

INSTALLATION.md

@@ -11,9 +11,9 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 2. Install [pgrx](https://github.com/pgcentralfoundation/pgrx)
 
 ```bash
-cargo install cargo-pgrx --version 0.13.1 --locked
+cargo install cargo-pgrx --version 0.16.1 --locked
 
-cargo pgrx init --pg17 $(which pg_config)
+cargo pgrx init --pg18 $(which pg_config)
 ```
 
 3. Clone the repo and install dependencies

extension/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vectorize"
-version = "0.22.2"
+version = "0.23.0"
 edition = "2021"
 publish = false
 
@@ -12,11 +12,12 @@ name = "pgrx_embed_vectorize"
 path = "./src/bin/pgrx_embed.rs"
 
 [features]
-default = ["pg17"]
+default = ["pg18"]
 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]
@@ -28,7 +29,7 @@ chrono = {version = "0.4.26", features = ["serde"] }
 handlebars = "5.1.0"
 log = "0.4.21"
 pgmq = "0.30.1"
-pgrx = "=0.13.1"
+pgrx = "=0.16.1"
 reqwest = {version = "0.12.16", features = ["json"] }
 serde = { version = "1.0.173", features = ["derive"] }
 serde_json = "1.0.103"
@@ -44,7 +45,7 @@ tokio = {version = "1.29.1", features = ["rt-multi-thread"] }
 url = "2.4.0"
 
 [dev-dependencies]
-pgrx-tests = "=0.13.1"
+pgrx-tests = "=0.16.1"
 rand = "0.8.5"
 whoami = "1.4.1"
 

extension/Makefile

@@ -1,7 +1,7 @@
 SQLX_OFFLINE:=true
 DISTNAME = $(shell grep -m 1 '^name' Cargo.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
 DISTVERSION  = $(shell grep -m 1 '^version' Cargo.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
-PG_VERSION:=17
+PG_VERSION:=18
 DATABASE_URL:=postgres://${USER}:${USER}@localhost:288${PG_VERSION}/postgres
 PGRX_PG_CONFIG:=$(shell cargo pgrx info pg-config pg${PG_VERSION})
 PGRX_VERSION := $(shell grep -E "^pgrx\s*=" Cargo.toml | cut -d'"' -f2 | tr -d '=')

extension/sql/vectorize--0.22.2--0.23.0.sql

@@ -207,7 +207,7 @@ fn rag(
 #[pg_extern]
 fn generate(
     input: &str,
-    model: default!(String, "'tembo/meta-llama/Meta-Llama-3-8B-Instruct'"),
+    model: default!(String, "'openai/gpt-4o-mini'"),
     api_key: default!(Option<String>, "NULL"),
 ) -> Result<String> {
     let model = Model::new(&model)?;

extension/src/api.rs

@@ -39,9 +39,8 @@ pub fn batch_texts(
 }
 
 // called by pg_cron on schedule
-// identifiers new inputs and enqueues them
+// identifies new inputs and enqueues them
 #[pg_extern]
-#[pg_guard]
 fn job_execute(job_name: String) {
     log!("pg-vectorize: refresh job: {}", job_name);
     let runtime = tokio::runtime::Builder::new_current_thread()