From b610e10e52a75ff148ed4dc332fc056d93e0f709 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Tue, 28 Jan 2025 14:27:32 +0530 Subject: [PATCH 1/4] ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE TEXT; --- scripts/sql/31902900_cipipeline_material_branch_regex.down.sql | 1 + scripts/sql/31902900_cipipeline_material_branch_regex.up.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 scripts/sql/31902900_cipipeline_material_branch_regex.down.sql create mode 100644 scripts/sql/31902900_cipipeline_material_branch_regex.up.sql diff --git a/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql b/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql new file mode 100644 index 0000000000..eb6dd15beb --- /dev/null +++ b/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql @@ -0,0 +1 @@ +ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE varchar(50); \ No newline at end of file diff --git a/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql b/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql new file mode 100644 index 0000000000..aa7f824d1e --- /dev/null +++ b/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql @@ -0,0 +1 @@ +ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE TEXT; \ No newline at end of file From 1f3b87736c4e532c48cc8ffe866c25288120f9bd Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 29 Jan 2025 15:09:38 +0530 Subject: [PATCH 2/4] use appDetail.AppId instead of appDetail.InstalledAppId in FetchResourceTreeWithHibernateForACD --- .../service/FullMode/resource/ResourceTreeService.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/appStore/installedApp/service/FullMode/resource/ResourceTreeService.go b/pkg/appStore/installedApp/service/FullMode/resource/ResourceTreeService.go index f6bccf4ba6..112db9c28f 100644 --- a/pkg/appStore/installedApp/service/FullMode/resource/ResourceTreeService.go +++ b/pkg/appStore/installedApp/service/FullMode/resource/ResourceTreeService.go @@ -196,7 +196,7 @@ func (impl *InstalledAppResourceServiceImpl) FetchResourceTreeWithHibernateForAC } defer cancel() deploymentAppName := util2.BuildDeployedAppName(appDetail.AppName, appDetail.EnvironmentName) - resourceTree, err := impl.fetchResourceTreeForACD(rctx, cn, appDetail.InstalledAppId, appDetail.EnvironmentId, appDetail.ClusterId, deploymentAppName, appDetail.Namespace) + resourceTree, err := impl.fetchResourceTreeForACD(rctx, cn, appDetail.AppId, appDetail.EnvironmentId, appDetail.ClusterId, deploymentAppName, appDetail.Namespace) appDetail.ResourceTree = resourceTree if err != nil { return *appDetail From 7e255ca3931db18d414595efa35a34d5fa677df3 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Mon, 3 Feb 2025 11:36:20 +0530 Subject: [PATCH 3/4] TEXT to varchar 250 in regex col of ci_pipeline_material --- scripts/sql/31902900_cipipeline_material_branch_regex.up.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql b/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql index aa7f824d1e..9d3b1f61e1 100644 --- a/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql +++ b/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql @@ -1 +1 @@ -ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE TEXT; \ No newline at end of file +ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE varchar(250); \ No newline at end of file From b608a9eb743d56d87d9a88e7bfebf28b2e49e204 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Tue, 4 Mar 2025 18:29:55 +0530 Subject: [PATCH 4/4] remove regex query --- scripts/sql/31902900_cipipeline_material_branch_regex.down.sql | 1 - scripts/sql/31902900_cipipeline_material_branch_regex.up.sql | 1 - 2 files changed, 2 deletions(-) delete mode 100644 scripts/sql/31902900_cipipeline_material_branch_regex.down.sql delete mode 100644 scripts/sql/31902900_cipipeline_material_branch_regex.up.sql diff --git a/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql b/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql deleted file mode 100644 index eb6dd15beb..0000000000 --- a/scripts/sql/31902900_cipipeline_material_branch_regex.down.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE varchar(50); \ No newline at end of file diff --git a/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql b/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql deleted file mode 100644 index 9d3b1f61e1..0000000000 --- a/scripts/sql/31902900_cipipeline_material_branch_regex.up.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ci_pipeline_material ALTER COLUMN regex TYPE varchar(250); \ No newline at end of file