From c8d99d7fc922330ce70274beaa1f40bf5421ff92 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 27 Feb 2026 07:54:33 +0100 Subject: [PATCH] replace SELECT * with explicit columns in teams command query (#8129) * fix: replace SELECT * with explicit columns in teams command query - Update sqlx offline cache for the changed query - Fix write_latest_ee_ref.sh to prefer matching EE worktree branch - Update ee-repo-ref.txt Co-Authored-By: Claude Opus 4.6 * chore: update ee-repo-ref to 8ffae1f43b31dc8136714fa612d22b6301773e27 This commit updates the EE repository reference after PR #434 was merged in windmill-ee-private. Previous ee-repo-ref: da1f8bf8676f85cac2b6fa2705246e1819d4b6f0 New ee-repo-ref: 8ffae1f43b31dc8136714fa612d22b6301773e27 Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 4.6 Co-authored-by: windmill-internal-app[bot] --- ...8234ca7d1efeee9661f3901f298da375e73f7.json | 202 ------------------ ...735f1a2270f23d73de95101e6350f6df40acc.json | 28 +++ backend/ee-repo-ref.txt | 2 +- backend/write_latest_ee_ref.sh | 16 +- 4 files changed, 43 insertions(+), 205 deletions(-) delete mode 100644 backend/.sqlx/query-08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7.json create mode 100644 backend/.sqlx/query-34721bce20aa8b2a2c6b9bd5455735f1a2270f23d73de95101e6350f6df40acc.json diff --git a/backend/.sqlx/query-08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7.json b/backend/.sqlx/query-08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7.json deleted file mode 100644 index a4445ebd16..0000000000 --- a/backend/.sqlx/query-08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT * FROM workspace_settings WHERE teams_team_id = $1 AND teams_command_script IS NOT NULL", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "workspace_id", - "type_info": "Varchar" - }, - { - "ordinal": 1, - "name": "slack_team_id", - "type_info": "Varchar" - }, - { - "ordinal": 2, - "name": "slack_name", - "type_info": "Varchar" - }, - { - "ordinal": 3, - "name": "slack_command_script", - "type_info": "Varchar" - }, - { - "ordinal": 4, - "name": "slack_email", - "type_info": "Varchar" - }, - { - "ordinal": 5, - "name": "customer_id", - "type_info": "Varchar" - }, - { - "ordinal": 6, - "name": "plan", - "type_info": "Varchar" - }, - { - "ordinal": 7, - "name": "webhook", - "type_info": "Text" - }, - { - "ordinal": 8, - "name": "deploy_to", - "type_info": "Varchar" - }, - { - "ordinal": 9, - "name": "ai_config", - "type_info": "Jsonb" - }, - { - "ordinal": 10, - "name": "large_file_storage", - "type_info": "Jsonb" - }, - { - "ordinal": 11, - "name": "git_sync", - "type_info": "Jsonb" - }, - { - "ordinal": 12, - "name": "default_app", - "type_info": "Varchar" - }, - { - "ordinal": 13, - "name": "default_scripts", - "type_info": "Jsonb" - }, - { - "ordinal": 14, - "name": "deploy_ui", - "type_info": "Jsonb" - }, - { - "ordinal": 15, - "name": "mute_critical_alerts", - "type_info": "Bool" - }, - { - "ordinal": 16, - "name": "color", - "type_info": "Varchar" - }, - { - "ordinal": 17, - "name": "operator_settings", - "type_info": "Jsonb" - }, - { - "ordinal": 18, - "name": "teams_command_script", - "type_info": "Text" - }, - { - "ordinal": 19, - "name": "teams_team_id", - "type_info": "Text" - }, - { - "ordinal": 20, - "name": "teams_team_name", - "type_info": "Text" - }, - { - "ordinal": 21, - "name": "git_app_installations", - "type_info": "Jsonb" - }, - { - "ordinal": 22, - "name": "ducklake", - "type_info": "Jsonb" - }, - { - "ordinal": 23, - "name": "slack_oauth_client_id", - "type_info": "Varchar" - }, - { - "ordinal": 24, - "name": "slack_oauth_client_secret", - "type_info": "Varchar" - }, - { - "ordinal": 25, - "name": "datatable", - "type_info": "Jsonb" - }, - { - "ordinal": 26, - "name": "teams_team_guid", - "type_info": "Text" - }, - { - "ordinal": 27, - "name": "auto_invite", - "type_info": "Jsonb" - }, - { - "ordinal": 28, - "name": "error_handler", - "type_info": "Jsonb" - }, - { - "ordinal": 29, - "name": "success_handler", - "type_info": "Jsonb" - }, - { - "ordinal": 30, - "name": "public_app_execution_limit_per_minute", - "type_info": "Int4" - } - ], - "parameters": { - "Left": [ - "Text" - ] - }, - "nullable": [ - false, - true, - true, - true, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true - ] - }, - "hash": "08f288d2781d823e109a9e5b8848234ca7d1efeee9661f3901f298da375e73f7" -} diff --git a/backend/.sqlx/query-34721bce20aa8b2a2c6b9bd5455735f1a2270f23d73de95101e6350f6df40acc.json b/backend/.sqlx/query-34721bce20aa8b2a2c6b9bd5455735f1a2270f23d73de95101e6350f6df40acc.json new file mode 100644 index 0000000000..208bfffa78 --- /dev/null +++ b/backend/.sqlx/query-34721bce20aa8b2a2c6b9bd5455735f1a2270f23d73de95101e6350f6df40acc.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT workspace_id, teams_command_script FROM workspace_settings WHERE teams_team_id = $1 AND teams_command_script IS NOT NULL", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "workspace_id", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "teams_command_script", + "type_info": "Text" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + true + ] + }, + "hash": "34721bce20aa8b2a2c6b9bd5455735f1a2270f23d73de95101e6350f6df40acc" +} diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index fa29675d6c..516de61c27 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -a797dd4d619cdab737e133ce593f2f8582ba21de +8ffae1f43b31dc8136714fa612d22b6301773e27 diff --git a/backend/write_latest_ee_ref.sh b/backend/write_latest_ee_ref.sh index dc35506551..7b18684e3a 100755 --- a/backend/write_latest_ee_ref.sh +++ b/backend/write_latest_ee_ref.sh @@ -1,7 +1,19 @@ #!/bin/bash -# Navigate to the target directory -cd ../../windmill-ee-private || cd ~/windmill-ee-private || { echo "Directory not found"; exit 1; } +# Detect the current branch name +branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) + +# Try, in order: matching EE worktree, sibling repo, home directory fallback +ee_worktree="$HOME/windmill-ee-private__worktrees/$branch" +if [ -n "$branch" ] && [ -d "$ee_worktree" ]; then + cd "$ee_worktree" +elif cd ../../windmill-ee-private 2>/dev/null; then + : +elif cd ~/windmill-ee-private 2>/dev/null; then + : +else + echo "Directory not found"; exit 1 +fi # Get the current commit hash commit_hash=$(git rev-parse HEAD)