Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'canary' into feat/better-auth

Browse Source
This commit is contained in:
Mauricio Siu
2025-02-12 20:56:23 -06:00
parent 6179cef1ee 030c8a312d
commit 8f562eefc1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/dokploy/drizzle/0066_soft_kronos.sql
View File

@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS "account" (
); );
CREATE TABLE IF NOT EXISTS "organization" ( CREATE TABLE IF NOT EXISTS "organization" (
"id" text PRIMARY KEY NOT NULL, "id" text PRIMARY KEY NOT NULL,mn cj.
"name" text NOT NULL, "name" text NOT NULL,
"slug" text, "slug" text,
"logo" text, "logo" text,
@@ -79,11 +79,16 @@ ADD COLUMN IF NOT EXISTS "stripeCustomerId" text,
ADD COLUMN IF NOT EXISTS "stripeSubscriptionId" text, ADD COLUMN IF NOT EXISTS "stripeSubscriptionId" text,
ADD COLUMN IF NOT EXISTS "serversQuantity" integer DEFAULT 0; ADD COLUMN IF NOT EXISTS "serversQuantity" integer DEFAULT 0;
-- Migrate email from auth table to user table
UPDATE "user" u
SET "email" = a."email"
FROM "auth" a
WHERE a."id" = u."userId";
-- Migrate admin users -- Migrate admin users
WITH admin_users AS ( WITH admin_users AS (
UPDATE "user" u UPDATE "user" u
SET SET
"email" = a."email",
"emailVerified" = true, "emailVerified" = true,
"role" = 'admin', "role" = 'admin',
"token" = a."token", "token" = a."token",
@@ -105,7 +110,7 @@ WITH admin_users AS (
FROM "auth" a FROM "auth" a
INNER JOIN "admin" adm ON a."id" = adm."adminId" INNER JOIN "admin" adm ON a."id" = adm."adminId"
WHERE a."id" = u."userId" WHERE a."id" = u."userId"
RETURNING u."userId", a."email" RETURNING u."userId", u."email"
) )
INSERT INTO "account" ("id", "accountId", "providerId", "password", "userId", "createdAt", "updatedAt") INSERT INTO "account" ("id", "accountId", "providerId", "password", "userId", "createdAt", "updatedAt")
SELECT SELECT
@@ -135,7 +140,6 @@ WITH admin_orgs AS (
-- Migrate regular users -- Migrate regular users
UPDATE "user" u UPDATE "user" u
SET SET
"email" = a."email",
"emailVerified" = true, "emailVerified" = true,
"role" = 'user', "role" = 'user',
"token" = a."token", "token" = a."token",