From c8cc9d2941dda2fedb959e1156c4f9b4f7dfab43 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 30 Jan 2025 18:25:08 +0100
Subject: [PATCH] fix: improve codebase support

---
 ...e58006013be26fcb9367b3c6830f38749799.json} | 10 +++----
 ...35a3765c9aa2d103e3df85c245d85ba32b3b9.json | 29 -------------------
 backend/windmill-common/src/cache.rs          | 13 +++++++--
 3 files changed, 16 insertions(+), 36 deletions(-)
 rename backend/.sqlx/{query-0bf123446bebbc357c58a53a9319f4954dbf3225e91cbe999e5b264c1a747664.json => query-d55eabd42559893bdf91c5fdab1ae58006013be26fcb9367b3c6830f38749799.json} (84%)
 delete mode 100644 backend/.sqlx/query-f3d3d105b76ec2eded521c3bb3735a3765c9aa2d103e3df85c245d85ba32b3b9.json

diff --git a/backend/.sqlx/query-0bf123446bebbc357c58a53a9319f4954dbf3225e91cbe999e5b264c1a747664.json b/backend/.sqlx/query-d55eabd42559893bdf91c5fdab1ae58006013be26fcb9367b3c6830f38749799.json
similarity index 84%
rename from backend/.sqlx/query-0bf123446bebbc357c58a53a9319f4954dbf3225e91cbe999e5b264c1a747664.json
rename to backend/.sqlx/query-d55eabd42559893bdf91c5fdab1ae58006013be26fcb9367b3c6830f38749799.json
index a7c52db59315f..93a338c13f71f 100644
--- a/backend/.sqlx/query-0bf123446bebbc357c58a53a9319f4954dbf3225e91cbe999e5b264c1a747664.json
+++ b/backend/.sqlx/query-d55eabd42559893bdf91c5fdab1ae58006013be26fcb9367b3c6830f38749799.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT content AS \"content!: String\",\n                    lock AS \"lock: String\", language AS \"language: Option<ScriptLang>\", envs AS \"envs: Vec<String>\", codebase AS \"codebase: String\" FROM script WHERE hash = $1 LIMIT 1",
+  "query": "SELECT content AS \"content!: String\",\n                    lock AS \"lock: String\", language AS \"language: Option<ScriptLang>\", envs AS \"envs: Vec<String>\", codebase LIKE '%.tar' as use_tar FROM script WHERE hash = $1 LIMIT 1",
   "describe": {
     "columns": [
       {
@@ -52,8 +52,8 @@
       },
       {
         "ordinal": 4,
-        "name": "codebase: String",
-        "type_info": "Varchar"
+        "name": "use_tar",
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -66,8 +66,8 @@
       true,
       false,
       true,
-      true
+      null
     ]
   },
-  "hash": "0bf123446bebbc357c58a53a9319f4954dbf3225e91cbe999e5b264c1a747664"
+  "hash": "d55eabd42559893bdf91c5fdab1ae58006013be26fcb9367b3c6830f38749799"
 }
diff --git a/backend/.sqlx/query-f3d3d105b76ec2eded521c3bb3735a3765c9aa2d103e3df85c245d85ba32b3b9.json b/backend/.sqlx/query-f3d3d105b76ec2eded521c3bb3735a3765c9aa2d103e3df85c245d85ba32b3b9.json
deleted file mode 100644
index 4f5d515e96067..0000000000000
--- a/backend/.sqlx/query-f3d3d105b76ec2eded521c3bb3735a3765c9aa2d103e3df85c245d85ba32b3b9.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT value, is_secret\n        FROM variable\n        WHERE path = $1 AND workspace_id = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "value",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "is_secret",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "f3d3d105b76ec2eded521c3bb3735a3765c9aa2d103e3df85c245d85ba32b3b9"
-}
diff --git a/backend/windmill-common/src/cache.rs b/backend/windmill-common/src/cache.rs
index 13d71dd4028eb..9f3d6a15f15fd 100644
--- a/backend/windmill-common/src/cache.rs
+++ b/backend/windmill-common/src/cache.rs
@@ -529,7 +529,7 @@ pub mod script {
                     lock AS \"lock: String\", \
                     language AS \"language: Option<ScriptLang>\", \
                     envs AS \"envs: Vec<String>\", \
-                    codebase AS \"codebase: String\" \
+                    codebase LIKE '%.tar' as use_tar \
                 FROM script WHERE hash = $1 LIMIT 1",
                 hash.0
             )
@@ -543,7 +543,16 @@ pub mod script {
                 meta: Some(ScriptMetadata {
                     language: r.language,
                     envs: r.envs,
-                    codebase: r.codebase,
+                    codebase: if let Some(use_tar) = r.use_tar {
+                        let sh = hash.0.to_string();
+                        if use_tar {
+                            Some(format!("{sh}.tar"))
+                        } else {
+                            Some(sh)
+                        }
+                    } else {
+                        None
+                    },
                 }),
             })
         });