From 6e9c350b4aa27355d03cb409da36e8f44ff548dc Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 6 Aug 2024 23:05:36 +0200
Subject: [PATCH] fix: email triggers sqlx CE and improve email parsing 
 (#4203)

* fix: CE sqlx

* update ee ref
---
 ...3f307eb201534aa25d8a2049d1949f4ec9e77.json | 20 +++++++++++++++++++
 ...73324cd5cbae2c3b77f24027802ea3896ef26.json | 12 +++++++++++
 ...9601723de8092796f3bbeb78191c1da30d225.json | 14 +++++++++++++
 backend/Cargo.toml                            |  1 +
 backend/ee-repo-ref.txt                       |  2 +-
 backend/windmill-worker/Cargo.toml            |  1 +
 backend/windmill-worker/src/worker.rs         |  2 +-
 7 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 backend/.sqlx/query-4e6e4ecaa7a874b07b6599b6b7b3f307eb201534aa25d8a2049d1949f4ec9e77.json
 create mode 100644 backend/.sqlx/query-a7d107fbeb8749d16ea3fea091573324cd5cbae2c3b77f24027802ea3896ef26.json
 create mode 100644 backend/.sqlx/query-f4942f502ba7f66bafb0b2de6979601723de8092796f3bbeb78191c1da30d225.json

diff --git a/backend/.sqlx/query-4e6e4ecaa7a874b07b6599b6b7b3f307eb201534aa25d8a2049d1949f4ec9e77.json b/backend/.sqlx/query-4e6e4ecaa7a874b07b6599b6b7b3f307eb201534aa25d8a2049d1949f4ec9e77.json
new file mode 100644
index 0000000000..afb8a2aada
--- /dev/null
+++ b/backend/.sqlx/query-4e6e4ecaa7a874b07b6599b6b7b3f307eb201534aa25d8a2049d1949f4ec9e77.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT value FROM metrics WHERE id = 'email_trigger_usage' AND created_at > NOW() - INTERVAL '1 day' ORDER BY created_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "value",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "4e6e4ecaa7a874b07b6599b6b7b3f307eb201534aa25d8a2049d1949f4ec9e77"
+}
diff --git a/backend/.sqlx/query-a7d107fbeb8749d16ea3fea091573324cd5cbae2c3b77f24027802ea3896ef26.json b/backend/.sqlx/query-a7d107fbeb8749d16ea3fea091573324cd5cbae2c3b77f24027802ea3896ef26.json
new file mode 100644
index 0000000000..9e26d239af
--- /dev/null
+++ b/backend/.sqlx/query-a7d107fbeb8749d16ea3fea091573324cd5cbae2c3b77f24027802ea3896ef26.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO metrics (id, value) VALUES ('email_trigger_usage', to_jsonb(1))",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "a7d107fbeb8749d16ea3fea091573324cd5cbae2c3b77f24027802ea3896ef26"
+}
diff --git a/backend/.sqlx/query-f4942f502ba7f66bafb0b2de6979601723de8092796f3bbeb78191c1da30d225.json b/backend/.sqlx/query-f4942f502ba7f66bafb0b2de6979601723de8092796f3bbeb78191c1da30d225.json
new file mode 100644
index 0000000000..25510e4150
--- /dev/null
+++ b/backend/.sqlx/query-f4942f502ba7f66bafb0b2de6979601723de8092796f3bbeb78191c1da30d225.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE metrics SET value = $1 WHERE id = 'email_trigger_usage' AND created_at > NOW() - INTERVAL '1 day'",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f4942f502ba7f66bafb0b2de6979601723de8092796f3bbeb78191c1da30d225"
+}
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 06e7664916..68e6d3113e 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -54,6 +54,7 @@ openidconnect = ["windmill-api/openidconnect"]
 cloud = ["windmill-queue/cloud", "windmill-worker/cloud"]
 jemalloc = ["windmill-common/jemalloc", "dep:tikv-jemallocator", "dep:tikv-jemalloc-sys", "dep:tikv-jemalloc-ctl"]
 tantivy = ["dep:windmill-indexer", "windmill-api/tantivy"]
+sqlx = ["windmill-worker/sqlx"]
 
 [dependencies]
 anyhow.workspace = true
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index e02e4aa6a6..2810a0cb9f 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-70e475a5cec356d2fe992038f303aea8988b5046
\ No newline at end of file
+2b3796942b621d1d738675fa00ff6be7e67faff3
\ No newline at end of file
diff --git a/backend/windmill-worker/Cargo.toml b/backend/windmill-worker/Cargo.toml
index 36e8bfcedd..c4e59197fe 100644
--- a/backend/windmill-worker/Cargo.toml
+++ b/backend/windmill-worker/Cargo.toml
@@ -17,6 +17,7 @@ flamegraph = []
 parquet = ["windmill-common/parquet", "dep:object_store"]
 flow_testing = []
 cloud = []
+sqlx = []
 
 [dependencies]
 windmill-queue.workspace = true
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index af4b4a9234..7120510f0f 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -2278,7 +2278,7 @@ async fn handle_queued_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>(
         return Err(Error::ExecutionErr(e.to_string()));
     }
 
-    #[cfg(not(feature = "enterprise"))]
+    #[cfg(any(not(feature = "enterprise"), feature = "sqlx"))]
     if job.created_by.starts_with("email-trigger-") {
         let daily_count = sqlx::query!(
             "SELECT value FROM metrics WHERE id = 'email_trigger_usage' AND created_at > NOW() - INTERVAL '1 day' ORDER BY created_at DESC LIMIT 1"