From cf3ddce68a292bf3dc17d20db4dbc76e8dcd1998 Mon Sep 17 00:00:00 2001
From: Diego Imbert <70353967+diegoimbert@users.noreply.github.com>
Date: Mon, 2 Mar 2026 19:01:18 +0100
Subject: [PATCH] Fix data tables not working with non-secret pg variables
 (#8195)

---
 backend/windmill-common/src/workspaces.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/backend/windmill-common/src/workspaces.rs b/backend/windmill-common/src/workspaces.rs
index cc255875d5..f56648f61e 100644
--- a/backend/windmill-common/src/workspaces.rs
+++ b/backend/windmill-common/src/workspaces.rs
@@ -564,19 +564,23 @@ async fn transform_json_unchecked(
             transform_json_unchecked(&resource, w_id, db).await?
         }
         serde_json::Value::String(s) if s.starts_with("$var:") => {
-            let variable = sqlx::query_scalar!(
-                "SELECT value FROM variable WHERE workspace_id = $1 AND path = $2",
-                &w_id,
-                &s[5..]
+            let (value, is_secret): (String, bool) = sqlx::query_as(
+                "SELECT value, is_secret FROM variable WHERE workspace_id = $1 AND path = $2",
             )
+            .bind(&w_id)
+            .bind(&s[5..])
             .fetch_one(db)
             .await
             .map_err(to_anyhow)?;
-            let mc = build_crypt(&db, &w_id).await?;
-            let variable = decrypt(&mc, variable).map_err(|e| {
-                Error::internal_err(format!("Error decrypting variable {}: {}", &s, e))
-            })?;
-            serde_json::Value::String(variable)
+            let value = if is_secret {
+                let mc = build_crypt(&db, &w_id).await?;
+                decrypt(&mc, value).map_err(|e| {
+                    Error::internal_err(format!("Error decrypting variable {}: {}", &s, e))
+                })?
+            } else {
+                value
+            };
+            serde_json::Value::String(value)
         }
         s @ serde_json::Value::String(_) => s.clone(),
         x => x.clone(),