From 71b7cca5697d74024c2643a3722784858f60a0be Mon Sep 17 00:00:00 2001 From: Rajesh Rajendran Date: Wed, 14 May 2025 18:42:25 +0200 Subject: [PATCH] Patch/api v1.22.0 (#3401) * fix(chalice): fixed duplicate autocomplete values * ci(actions): possible fix for pull --rebase Signed-off-by: rjshrjndrn --------- Signed-off-by: rjshrjndrn Co-authored-by: Taha Yassine Kraiem --- .github/workflows/patch-build.yaml | 6 ++---- api/chalicelib/core/autocomplete/autocomplete.py | 7 ++++--- ee/api/chalicelib/core/autocomplete/autocomplete_ch.py | 7 ++++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/patch-build.yaml b/.github/workflows/patch-build.yaml index c6ef462c1..3588883dd 100644 --- a/.github/workflows/patch-build.yaml +++ b/.github/workflows/patch-build.yaml @@ -2,7 +2,6 @@ on: workflow_dispatch: - description: 'This workflow will build for patches for latest tag, and will Always use commit from main branch.' inputs: services: description: 'Comma separated names of services to build(in small letters).' @@ -21,11 +20,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - fetch-depth: 1 - name: Rebase with main branch, to make sure the code has latest main changes run: | - git pull --rebase origin main + git fetch origin main + git rebase origin/main - name: Downloading yq run: | diff --git a/api/chalicelib/core/autocomplete/autocomplete.py b/api/chalicelib/core/autocomplete/autocomplete.py index aa40ccbd0..64521e087 100644 --- a/api/chalicelib/core/autocomplete/autocomplete.py +++ b/api/chalicelib/core/autocomplete/autocomplete.py @@ -85,7 +85,8 @@ def __generic_query(typename, value_length=None): ORDER BY value""" if value_length is None or value_length > 2: - return f"""(SELECT DISTINCT value, type + return f"""SELECT DISTINCT ON(value,type) value, type + ((SELECT DISTINCT value, type FROM {TABLE} WHERE project_id = %(project_id)s @@ -101,7 +102,7 @@ def __generic_query(typename, value_length=None): AND type='{typename.upper()}' AND value ILIKE %(value)s ORDER BY value - LIMIT 5);""" + LIMIT 5)) AS raw;""" return f"""SELECT DISTINCT value, type FROM {TABLE} WHERE @@ -326,7 +327,7 @@ def __search_metadata(project_id, value, key=None, source=None): AND {colname} ILIKE %(svalue)s LIMIT 5)""") with pg_client.PostgresClient() as cur: cur.execute(cur.mogrify(f"""\ - SELECT key, value, 'METADATA' AS TYPE + SELECT DISTINCT ON(key, value) key, value, 'METADATA' AS TYPE FROM({" UNION ALL ".join(sub_from)}) AS all_metas LIMIT 5;""", {"project_id": project_id, "value": helper.string_to_sql_like(value), "svalue": helper.string_to_sql_like("^" + value)})) diff --git a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py index 2eed9d5bf..7118e91e6 100644 --- a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py +++ b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py @@ -86,7 +86,8 @@ def __generic_query(typename, value_length=None): ORDER BY value""" if value_length is None or value_length > 2: - return f"""(SELECT DISTINCT value, type + return f"""SELECT DISTINCT ON(value, type) value, type + FROM ((SELECT DISTINCT value, type FROM {TABLE} WHERE project_id = %(project_id)s @@ -102,7 +103,7 @@ def __generic_query(typename, value_length=None): AND type='{typename.upper()}' AND value ILIKE %(value)s ORDER BY value - LIMIT 5);""" + LIMIT 5)) AS raw;""" return f"""SELECT DISTINCT value, type FROM {TABLE} WHERE @@ -257,7 +258,7 @@ def __search_metadata(project_id, value, key=None, source=None): WHERE project_id = %(project_id)s AND {colname} ILIKE %(svalue)s LIMIT 5)""") with ch_client.ClickHouseClient() as cur: - query = cur.format(query=f"""SELECT key, value, 'METADATA' AS TYPE + query = cur.format(query=f"""SELECT DISTINCT ON(key, value) key, value, 'METADATA' AS TYPE FROM({" UNION ALL ".join(sub_from)}) AS all_metas LIMIT 5;""", parameters={"project_id": project_id, "value": helper.string_to_sql_like(value), "svalue": helper.string_to_sql_like("^" + value)})