From 2e1cd3db2879e03b7917794aa92d6e5d761a8893 Mon Sep 17 00:00:00 2001 From: John Wang Date: Mon, 15 May 2023 12:03:08 +0800 Subject: [PATCH] fix: uuid-ossp extension create failed in pgsql (#10) --- api/migrations/versions/64b051264f32_init.py | 4 ++++ docker/docker-compose.middleware.yaml | 1 - docker/docker-compose.yaml | 1 - docker/volumes/db/scripts/init_extension.sh | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/migrations/versions/64b051264f32_init.py b/api/migrations/versions/64b051264f32_init.py index 84e1f2af17..d2160c128d 100644 --- a/api/migrations/versions/64b051264f32_init.py +++ b/api/migrations/versions/64b051264f32_init.py @@ -18,6 +18,8 @@ depends_on = None def upgrade(): # ### commands auto generated by Alembic - please adjust! ### + op.execute('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";') + op.create_table('account_integrates', sa.Column('id', postgresql.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('account_id', postgresql.UUID(), nullable=False), @@ -790,4 +792,6 @@ def downgrade(): op.drop_table('accounts') op.drop_table('account_integrates') + + op.execute('DROP EXTENSION IF EXISTS "uuid-ossp";') # ### end Alembic commands ### diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml index 09372ca2a3..7e029d663a 100644 --- a/docker/docker-compose.middleware.yaml +++ b/docker/docker-compose.middleware.yaml @@ -13,7 +13,6 @@ services: PGDATA: /var/lib/postgresql/data/pgdata volumes: - ./volumes/db/data:/var/lib/postgresql/data - - ./volumes/db/scripts:/docker-entrypoint-initdb.d/ ports: - "5432:5432" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 7d1542fbca..40935d2926 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -163,7 +163,6 @@ services: PGDATA: /var/lib/postgresql/data/pgdata volumes: - ./volumes/db/data:/var/lib/postgresql/data - - ./volumes/db/scripts:/docker-entrypoint-initdb.d/ ports: - "5432:5432" diff --git a/docker/volumes/db/scripts/init_extension.sh b/docker/volumes/db/scripts/init_extension.sh index abad1e5182..e69de29bb2 100644 --- a/docker/volumes/db/scripts/init_extension.sh +++ b/docker/volumes/db/scripts/init_extension.sh @@ -1 +0,0 @@ -psql -U postgres -d dify -c 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";' \ No newline at end of file