From 3ac243057989cc307cab3a9be48fc82c305acb3e Mon Sep 17 00:00:00 2001
From: Adam Hendel <ChuckHend@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:52:04 -0500
Subject: [PATCH] Patch dollar quote for jobs (#102)

* dollar quote jobs

* bump ver

* fix test

* change ci path
---
 .github/workflows/extension_upgrade.yml     | 4 ++--
 extension/Cargo.toml                        | 2 +-
 extension/Trunk.toml                        | 2 +-
 extension/sql/vectorize--0.14.1--0.14.2.sql | 0
 extension/src/job.rs                        | 8 +++-----
 extension/tests/integration_tests.rs        | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 extension/sql/vectorize--0.14.1--0.14.2.sql

diff --git a/.github/workflows/extension_upgrade.yml b/.github/workflows/extension_upgrade.yml
index 8509f93..b7b8052 100644
--- a/.github/workflows/extension_upgrade.yml
+++ b/.github/workflows/extension_upgrade.yml
@@ -11,13 +11,13 @@ on:
       - main
     paths:
       - ".github/workflows/extension_upgrade.yml"
-      - "./extension/**"
+      - "extension/**"
   push:
     branches:
       - main
     paths:
       - ".github/workflows/extension_upgrade.yml"
-      - "./extension/**"
+      - "extension/**"
 
 jobs:
   test:
diff --git a/extension/Cargo.toml b/extension/Cargo.toml
index d528042..b6fba82 100644
--- a/extension/Cargo.toml
+++ b/extension/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vectorize"
-version = "0.14.1"
+version = "0.14.2"
 edition = "2021"
 publish = false
 
diff --git a/extension/Trunk.toml b/extension/Trunk.toml
index f5a2f02..eb62212 100644
--- a/extension/Trunk.toml
+++ b/extension/Trunk.toml
@@ -6,7 +6,7 @@ description = "The simplest way to orchestrate vector search on Postgres."
 homepage = "https://github.com/tembo-io/pg_vectorize"
 documentation = "https://github.com/tembo-io/pg_vectorize"
 categories = ["orchestration", "machine_learning"]
-version = "0.14.1"
+version = "0.14.2"
 
 [build]
 postgres_version = "15"
diff --git a/extension/sql/vectorize--0.14.1--0.14.2.sql b/extension/sql/vectorize--0.14.1--0.14.2.sql
new file mode 100644
index 0000000..e69de29
diff --git a/extension/src/job.rs b/extension/src/job.rs
index dae82ba..438be9e 100644
--- a/extension/src/job.rs
+++ b/extension/src/job.rs
@@ -47,7 +47,7 @@ fn _handle_table_update(job_name: &str, record_ids: Vec<String>, inputs: Vec<Str
 
     // send the job message to the queue
     let query = format!(
-        "select pgmq.send('{VECTORIZE_QUEUE}', '{}');",
+        "select pgmq.send('{VECTORIZE_QUEUE}', $${}$$::jsonb);",
         serde_json::to_string(&job_message).unwrap()
     );
     let _ran: Result<_, spi::Error> = Spi::connect(|mut c| {
@@ -169,10 +169,8 @@ pub fn initalize_table_job(
             inputs: b,
         };
         let query = format!(
-            "select pgmq.send('{VECTORIZE_QUEUE}', '{}');",
-            serde_json::to_string(&job_message)
-                .unwrap()
-                .replace('\'', "''")
+            "select pgmq.send('{VECTORIZE_QUEUE}', $${}$$::jsonb);",
+            serde_json::to_string(&job_message).unwrap()
         );
         let _ran: Result<_, spi::Error> = Spi::connect(|mut c| {
             let _r = c.update(&query, None, None)?;
diff --git a/extension/tests/integration_tests.rs b/extension/tests/integration_tests.rs
index 77ffefd..f30cab0 100644
--- a/extension/tests/integration_tests.rs
+++ b/extension/tests/integration_tests.rs
@@ -167,7 +167,7 @@ async fn test_realtime_job() {
 
     let insert_query = format!(
         "INSERT INTO \"{test_table_name}\"(product_id, product_name, description)
-        VALUES ({random_product_id}, 'car tester', 'a product for testing cars');"
+        VALUES ({random_product_id}, 'car tester', $$a product for testing car's components$$);"
     );
 
     // insert a new row