From c99f28652e8c31eba86e13e0475d4e599f9ebe7f Mon Sep 17 00:00:00 2001 From: joachim-danswer Date: Wed, 28 May 2025 15:47:40 -0700 Subject: [PATCH] Extension creation in MT migration --- .../versions/495cb26ce93e_create_knowlege_graph_tables.py | 7 ++++--- .../versions/3b9f09038764_add_read_only_kg_user.py | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/alembic/versions/495cb26ce93e_create_knowlege_graph_tables.py b/backend/alembic/versions/495cb26ce93e_create_knowlege_graph_tables.py index dcbba3d942a2..9ec774ed9f73 100644 --- a/backend/alembic/versions/495cb26ce93e_create_knowlege_graph_tables.py +++ b/backend/alembic/versions/495cb26ce93e_create_knowlege_graph_tables.py @@ -27,9 +27,6 @@ depends_on = None def upgrade() -> None: - # Enable pg_trgm extension if not already enabled - op.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm") - # Create a new permission-less user to be later used for knowledge graph queries. # The user will later get temporary read priviledges for a specific view that will be # ad hoc generated specific to a knowledge graph query. @@ -38,6 +35,10 @@ def upgrade() -> None: # environment variables MUST be set. Otherwise, an exception will be raised. if not MULTI_TENANT: + + # Enable pg_trgm extension if not already enabled + op.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm") + # Create read-only db user here only in single tenant mode. For multi-tenant mode, # the user is created in the alembic_tenants migration. if not (DB_READONLY_USER and DB_READONLY_PASSWORD): diff --git a/backend/alembic_tenants/versions/3b9f09038764_add_read_only_kg_user.py b/backend/alembic_tenants/versions/3b9f09038764_add_read_only_kg_user.py index 887a5c9dda9a..e962ea124010 100644 --- a/backend/alembic_tenants/versions/3b9f09038764_add_read_only_kg_user.py +++ b/backend/alembic_tenants/versions/3b9f09038764_add_read_only_kg_user.py @@ -23,6 +23,10 @@ depends_on = None def upgrade() -> None: if MULTI_TENANT: + + # Enable pg_trgm extension if not already enabled + op.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm") + # Create read-only db user here only in multi-tenant mode. For single-tenant mode, # the user is created in the standard migration. if not (DB_READONLY_USER and DB_READONLY_PASSWORD):