starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-21 00:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: leave display_name out of the fork comparison

Browse Source 
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
hugocasa
2026-09-14 15:47:26 +02:00
co-authored by Claude Opus 5
parent 0c159f31ba
commit 873b1e54d6
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/.sqlx/query-9a93affcf9eedcfebeadcd9c332c1f2f20becaf4fdda42479fb4ef2fd61f0df5.json → backend/.sqlx/query-2768622b76ad92c05f4f44d997aff285707e1a43ce85e5bb8e87849d78a0637f.json
Generated
+3 -9
View File
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
"query": "SELECT schema, description, format_extension, is_fileset, display_name\n FROM resource_type\n WHERE workspace_id = $1 AND name = $2",
"query": "SELECT schema, description, format_extension, is_fileset\n FROM resource_type\n WHERE workspace_id = $1 AND name = $2",
"describe": {
"columns": [
{
@@ -22,11 +22,6 @@
"ordinal": 3,
"name": "is_fileset",
"type_info": "Bool"
},
{
"ordinal": 4,
"name": "display_name",
"type_info": "Varchar"
}
],
"parameters": {
@@ -39,9 +34,8 @@
true,
true,
true,
false,
true
false
]
},
"hash": "9a93affcf9eedcfebeadcd9c332c1f2f20becaf4fdda42479fb4ef2fd61f0df5"
"hash": "2768622b76ad92c05f4f44d997aff285707e1a43ce85e5bb8e87849d78a0637f"
}
backend/windmill-api-workspaces/src/workspaces.rs
+2 -3
View File
@@ -11948,7 +11948,7 @@ async fn compare_two_resource_types(
) -> Result<ItemComparison> {
// Get resource type from each workspace
let source_resource_type = sqlx::query!(
"SELECT schema, description, format_extension, is_fileset, display_name
"SELECT schema, description, format_extension, is_fileset
FROM resource_type
WHERE workspace_id = $1 AND name = $2",
source_workspace_id,
@@ -11958,7 +11958,7 @@ async fn compare_two_resource_types(
.await?;
let target_resource_type = sqlx::query!(
"SELECT schema, description, format_extension, is_fileset, display_name
"SELECT schema, description, format_extension, is_fileset
FROM resource_type
WHERE workspace_id = $1 AND name = $2",
fork_workspace_id,
@@ -11975,7 +11975,6 @@ async fn compare_two_resource_types(
|| source.description != target.description
|| source.format_extension != target.format_extension
|| source.is_fileset != target.is_fileset
|| source.display_name != target.display_name
{
has_changes = true;
}