Merge remote-tracking branch 'origin/api-v1.17.0' into dev

# Conflicts: # ee/api/requirements-alerts.txt # ee/api/requirements-crons.txt # ee/api/requirements.txt
tahayk · Jan 12, 2024 · af643c9 · af643c9
2 parents ca374a1 + bd87ae5
commit af643c9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/ee/api/Pipfile b/ee/api/Pipfile
@@ -6,23 +6,23 @@ name = "pypi"
 [packages]
 urllib3 = "==1.26.16"
 requests = "==2.31.0"
-boto3 = "==1.29.7"
+boto3 = "==1.34.1"
 pyjwt = "==2.8.0"
 psycopg2-binary = "==2.9.9"
-elasticsearch = "==8.11.0"
+elasticsearch = "==8.11.1"
 jira = "==3.5.2"
-fastapi = "==0.104.1"
+fastapi = "==0.105.0"
 gunicorn = "==21.2.0"
 python-decouple = "==3.8"
 apscheduler = "==3.10.4"
 python-multipart = "==0.0.6"
 redis = "==5.0.1"
 python3-saml = "==1.16.0"
 azure-storage-blob = "==12.19.0"
-uvicorn = {extras = ["standard"], version = "==0.23.2"}
+psycopg = {extras = ["pool", "binary"], version = "==3.1.15"}
+uvicorn = {extras = ["standard"], version = "==0.25.0"}
 pydantic = {extras = ["email"], version = "==2.3.0"}
 clickhouse-driver = {extras = ["lz4"], version = "==0.2.6"}
-psycopg = {extras = ["binary", "pool"], version = "==3.1.12"}
 
 [dev-packages]
 

diff --git a/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql b/ee/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql
@@ -29,6 +29,11 @@ UPDATE public.sessions
 SET has_ut_test= TRUE
 WHERE session_id IN (SELECT session_id FROM public.ut_tests_signals);
 
+DROP INDEX IF EXISTS public.errors_error_id_idx;
+DROP INDEX IF EXISTS public.issues_issue_id_idx;
+DROP INDEX IF EXISTS public.user_favorite_sessions_user_id_session_id_idx;
+DROP INDEX IF EXISTS public.projects_project_key_idx;
+
 COMMIT;
 
 \elif :is_next

diff --git a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -225,7 +225,6 @@ $$
                 beacon_size               integer                     NOT NULL        DEFAULT 0
             );
 
-            CREATE INDEX projects_project_key_idx ON public.projects (project_key);
             CREATE INDEX projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
             CREATE INDEX projects_tenant_id_idx ON public.projects (tenant_id);
 
@@ -274,7 +273,7 @@ $$
                 button_url      text        NULL,
                 image_url       text        NULL,
                 created_at      timestamp   NOT NULL DEFAULT timezone('utc'::text, now()),
-                options         jsonb       NOT NULL DEFAULT'{}'::jsonb,
+                options         jsonb       NOT NULL DEFAULT '{}'::jsonb,
                 CONSTRAINT notification_tenant_xor_user CHECK ( tenant_id NOTNULL AND user_id ISNULL OR
                                                                 tenant_id ISNULL AND user_id NOTNULL )
             );
@@ -401,7 +400,6 @@ $$
             CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception';
             CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id);
             CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception';
-            CREATE INDEX errors_error_id_idx ON public.errors (error_id);
             CREATE INDEX errors_parent_error_id_idx ON public.errors (parent_error_id);
 
             CREATE TABLE public.user_favorite_errors
@@ -541,7 +539,6 @@ $$
                 session_id bigint  NOT NULL REFERENCES public.sessions (session_id) ON DELETE CASCADE,
                 PRIMARY KEY (user_id, session_id)
             );
-            CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON public.user_favorite_sessions (user_id, session_id);
 
 
             CREATE TABLE public.assigned_sessions

diff --git a/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql b/scripts/schema/db/init_dbs/postgresql/1.17.0/1.17.0.sql
@@ -29,6 +29,11 @@ UPDATE public.sessions
 SET has_ut_test= TRUE
 WHERE session_id IN (SELECT session_id FROM public.ut_tests_signals);
 
+DROP INDEX IF EXISTS public.errors_error_id_idx;
+DROP INDEX IF EXISTS public.issues_issue_id_idx;
+DROP INDEX IF EXISTS public.user_favorite_sessions_user_id_session_id_idx;
+DROP INDEX IF EXISTS public.projects_project_key_idx;
+
 COMMIT;
 
 \elif :is_next

diff --git a/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/scripts/schema/db/init_dbs/postgresql/init_schema.sql
@@ -202,7 +202,6 @@ $$
                 beacon_size               integer                     NOT NULL        DEFAULT 0
             );
 
-            CREATE INDEX projects_project_key_idx ON public.projects (project_key);
             CREATE INDEX projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
 
             CREATE TRIGGER on_insert_or_update
@@ -363,7 +362,6 @@ $$
             CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception';
             CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id);
             CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception';
-            CREATE INDEX errors_error_id_idx ON public.errors (error_id);
             CREATE INDEX errors_parent_error_id_idx ON public.errors (parent_error_id);
 
             CREATE TABLE public.user_favorite_errors
@@ -502,7 +500,6 @@ $$
                 session_id bigint  NOT NULL REFERENCES public.sessions (session_id) ON DELETE CASCADE,
                 PRIMARY KEY (user_id, session_id)
             );
-            CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON public.user_favorite_sessions (user_id, session_id);
 
 
             CREATE TABLE public.assigned_sessions