Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
build: Migrate (#3266)
Ivan Starkovf2ce532dcb66
diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yamlnew file mode 100644index 0000000000..53d603f5e9--- /dev/null+++ b/.github/workflows/migrate.yaml@@ -0,0 +1,98 @@+name: Migrate++on:+ push:+ branches:+ - "migrate"+ - "main"+ - "*.staging"++# Pending if other migration from the same branch is running+concurrency: migrate-${{ github.ref_name }}++permissions:+ contents: read # to fetch code (actions/checkout)+ statuses: write # This is required for the GitHub Script createCommitStatus to work++jobs:+ migrate:+ # This workflow is triggered only on pushes to the `main`, `*.staging` or 'migrate' branches.+ # For `*.staging` and `migrate` it specifically checks if the commit message starts with `::migrate::`,+ # indicating a migration-related change.+ #+ # Example usage:+ # Execute a commit with a migration flag using:+ # git commit --allow-empty -m "::migrate::test description"+ # Note:+ # This setup is a temporary measure. The intention is to transition to a fully automated publish and release process via GitHub Actions in the future.+ if: (github.ref_name == 'main') || ((github.ref_name == 'migrate' || endsWith(github.ref_name, '.staging')) && startsWith(github.event.head_commit.message, '::migrate::'))++ runs-on: ubuntu-latest++ environment:+ name: ${{ endsWith(github.ref_name, '.staging') && 'postgres_production' || 'postgres_development' }}++ timeout-minutes: 20++ steps:+ - uses: actions/checkout@v4+ with:+ ref: ${{ github.sha }} # HEAD commit instead of merge commit++ - uses: pnpm/action-setup@v3+ - uses: actions/setup-node@v4+ with:+ node-version: 20+ cache: pnpm++ - name: pnpm instal+ run: pnpm install --ignore-scripts++ - name: build prisma client+ run: pnpm --filter '@webstudio-is/prisma-client...' run build++ - name: execute migration+ run: pnpm --filter '@webstudio-is/prisma-client' run migrations migrate+ env:+ DIRECT_URL: ${{ secrets.DIRECT_URL }}++ # Prints pending migrations+ pending:+ if: always()++ needs: [migrate]++ runs-on: ubuntu-latest++ environment:+ name: ${{ endsWith(github.ref_name, '.staging') && 'postgres_production' || 'postgres_development' }}++ steps:+ - uses: actions/checkout@v4+ with:+ ref: ${{ github.sha }} # HEAD commit instead of merge commit++ - uses: pnpm/action-setup@v3+ - uses: actions/setup-node@v4+ with:+ node-version: 20+ cache: pnpm++ - name: pnpm instal+ run: pnpm install --ignore-scripts++ - name: build prisma client+ run: pnpm --filter '@webstudio-is/prisma-client...' run build++ - name: get pending+ id: pending+ run: |+ echo "value=$(pnpm --filter '@webstudio-is/prisma-client' run migrations pending-count | grep ::pending-count::)" >> $GITHUB_OUTPUT+ env:+ DIRECT_URL: ${{ secrets.DIRECT_URL }}++ - uses: ./.github/actions/add-status+ with:+ title: "⭕ Pending Migrations"+ description: ${{ steps.pending.outputs.value }}+ url: "https://webstudio.is"diff --git a/.gitignore b/.gitignoreindex 391ae908a8..729fb8c0ba 100644--- a/.gitignore+++ b/.gitignore@@ -56,3 +56,6 @@ tsconfig.tsbuildinfo# wrangler buildsdist++# should be here otherwise if placed inside prisma-client pnpm deploy doesn't copy it+packages/prisma-client/src/__generated__\ No newline at end of filediff --git a/packages/prisma-client/.gitignore b/packages/prisma-client/.gitignoredeleted file mode 100644index 1156b277ce..0000000000--- a/packages/prisma-client/.gitignore+++ /dev/null@@ -1 +0,0 @@-src/__generated__diff --git a/packages/prisma-client/migrations-cli/cli.ts b/packages/prisma-client/migrations-cli/cli.tsindex 6cb0e672db..5543023da8 100755--- a/packages/prisma-client/migrations-cli/cli.ts+++ b/packages/prisma-client/migrations-cli/cli.ts@@ -14,6 +14,7 @@ Commands:migrate — Apply all pending migrationsreset — Clear the database and apply all migrationsstatus — Information about the state of the migrations+ pending-count — Get the number of pending migrationsresolve <applied|rolled-back> <name> — Mark a failed migration as applied or rolled-backArguments@@ -65,6 +66,12 @@ const main = async () => {return;}+ if (command === "pending-count") {+ const count = await commands.pendingCount();+ console.info("::pending-count::", count);+ return;+ }+if (command === "resolve") {const type = args.positionals[1];diff --git a/packages/prisma-client/migrations-cli/commands.ts b/packages/prisma-client/migrations-cli/commands.tsindex bf45a7c237..29eafb6d65 100644--- a/packages/prisma-client/migrations-cli/commands.ts+++ b/packages/prisma-client/migrations-cli/commands.ts@@ -333,6 +333,12 @@ export const status = async () => {logger.info("");};+export const pendingCount = async () => {+ const status = await getStatus();++ return status.pending.length;+};+// Silimar to https://www.prisma.io/docs/reference/api-reference/command-reference#migrate-resolveexport const resolve = async ({migrationName,diff --git a/packages/prisma-client/migrations-cli/prisma-migrations.ts b/packages/prisma-client/migrations-cli/prisma-migrations.tsindex 81da152c74..6283cecbd8 100644--- a/packages/prisma-client/migrations-cli/prisma-migrations.ts+++ b/packages/prisma-client/migrations-cli/prisma-migrations.ts@@ -7,8 +7,10 @@ import path from "node:path";import fs from "node:fs";import { fileURLToPath } from "node:url";import { createHash } from "node:crypto";-import { prisma } from "../src/prisma";+import { createPrisma } from "../src/prisma";import { UserError } from "./errors";+// eslint-disable-next-line import/no-internal-modules+import { PrismaClient } from "../src/__generated__";const __dirname = path.dirname(fileURLToPath(import.meta.url));@@ -16,6 +18,29 @@ export const prismaDir = path.resolve(__dirname, "..", "prisma");export const schemaFilePath = path.join(prismaDir, "schema.prisma");export const migrationsDir = path.join(prismaDir, "migrations");+let prisma_: PrismaClient | undefined;++const context = {+ // delay prisma initialization until it's actually needed+ // this is needed as we read dotenv in the main file+ get prisma() {+ if (process.env.DIRECT_URL === undefined) {+ throw new Error("DIRECT_URL is not set");+ }++ prisma_ =+ prisma_ ??+ createPrisma({+ datasourceUrl: process.env.DIRECT_URL,+ // 10 minutes+ timeout: 10 * 60 * 1000,+ maxWait: 5000,+ });++ return prisma_;+ },+};+export const getMigrationFilePath = (migrationName: string,type: "ts" | "sql"@@ -24,7 +49,8 @@ export const getMigrationFilePath = (export const ensureMigrationTable = async () => {// https://github.com/prisma/prisma-engines/blob/4.3.0/migration-engine/ARCHITECTURE.md#the-_prisma_migrations-table// https://github.com/prisma/prisma-engines/blob/88f6ab88e559ef52ab26bc98f1da15200e0c25b4/migration-engine/connectors/sql-migration-connector/src/flavour/postgres.rs#L211-L226- await prisma.$executeRaw`CREATE TABLE IF NOT EXISTS _prisma_migrations (+ await context.prisma+ .$executeRaw`CREATE TABLE IF NOT EXISTS _prisma_migrations (id VARCHAR(36) PRIMARY KEY NOT NULL,checksum VARCHAR(64) NOT NULL,finished_at TIMESTAMPTZ,@@ -72,7 +98,7 @@ export type PrismaMigration = {export const getMigrations = async () => {await ensureMigrationTable();- return prisma.$queryRaw<+ return context.prisma.$queryRaw<PrismaMigration[]>`select * from _prisma_migrations order by migration_name`;};@@ -82,7 +108,7 @@ const getByName = async (): Promise<PrismaMigration | undefined> => {await ensureMigrationTable();- const migrations = await prisma.$queryRaw<+ const migrations = await context.prisma.$queryRaw<PrismaMigration[]>`select * from _prisma_migrations where migration_name = ${migrationName}`;return migrations[0];@@ -97,11 +123,11 @@ export const getFileChecksum = (filePath: string) => {export const setStarted = async (migrationName: string, filePath: string) => {await ensureMigrationTable();- await prisma.$executeRaw`delete from _prisma_migrations+ await context.prisma.$executeRaw`delete from _prisma_migrationswhere id in (- select id from _prisma_migrations- where migration_name = ${migrationName}- and rolled_back_at is not null+ select id from _prisma_migrations+ where migration_name = ${migrationName}+ and rolled_back_at is not nulllimit 1)`;@@ -116,13 +142,13 @@ export const setStarted = async (migrationName: string, filePath: string) => {const checksum = getFileChecksum(filePath);- await prisma.$executeRaw`insert into _prisma_migrations (- id,- checksum,+ await context.prisma.$executeRaw`insert into _prisma_migrations (+ id,+ checksum,migration_name) values (- gen_random_uuid()::text,- ${checksum},+ gen_random_uuid()::text,+ ${checksum},${migrationName})`;};@@ -145,7 +171,7 @@ export const setFailed = async (migrationName: string, error: string) => {);}- await prisma.$executeRaw`update _prisma_migrations set logs = ${error}+ await context.prisma.$executeRaw`update _prisma_migrations set logs = ${error}where migration_name = ${migrationName}`;};@@ -169,9 +195,9 @@ export const setApplied = async (migrationName: string) => {}// https://github.com/prisma/prisma-engines/blob/88f6ab88e559ef52ab26bc98f1da15200e0c25b4/migration-engine/core/src/commands/apply_migrations.rs#L72-L73- await prisma.$executeRaw`update _prisma_migrations set- finished_at = now(),- applied_steps_count = applied_steps_count + 1+ await context.prisma.$executeRaw`update _prisma_migrations set+ finished_at = now(),+ applied_steps_count = applied_steps_count + 1where migration_name = ${migrationName}`;};@@ -187,7 +213,8 @@ export const setRolledBack = async (migrationName: string) => {);}- await prisma.$executeRaw`update _prisma_migrations set rolled_back_at = now()+ await context.prisma+ .$executeRaw`update _prisma_migrations set rolled_back_at = now()where migration_name = ${migrationName}`;};@@ -230,7 +257,7 @@ export const resetDatabase = async () => {input: sqlToDeleteEverything,})`prisma db execute --stdin --schema ${schemaFilePath}`;- await prisma.$executeRaw`DROP TABLE IF EXISTS _prisma_migrations`;+ await context.prisma.$executeRaw`DROP TABLE IF EXISTS _prisma_migrations`;};// https://www.prisma.io/docs/reference/api-reference/command-reference#migrate-diffdiff --git a/packages/prisma-client/prisma/migrations/template.txt b/packages/prisma-client/prisma/migrations/template.txtindex 452ec31fc4..32c551709b 100644--- a/packages/prisma-client/prisma/migrations/template.txt+++ b/packages/prisma-client/prisma/migrations/template.txt@@ -20,6 +20,12 @@ export default () => {url: process.env.DIRECT_URL,},},++ transactionOptions: {+ timeout: 10 * 60 * 1000,+ maxWait: 5000,+ },+// Uncomment to see the queries in console as the migration runslog: ["query", "info", "warn", "error"],});diff --git a/packages/prisma-client/src/prisma.ts b/packages/prisma-client/src/prisma.tsindex 0568d201f6..2034aadd21 100644--- a/packages/prisma-client/src/prisma.ts+++ b/packages/prisma-client/src/prisma.ts@@ -36,6 +36,26 @@ declare global {const logPrisma = process.env.NODE_ENV === "production";+type PrismaClientOptions = {+ datasourceUrl: string;+ timeout?: number;+ maxWait?: number;+};++export const createPrisma = ({+ datasourceUrl,+ timeout = 5000,+ maxWait = 2000,+}: PrismaClientOptions) => {+ return new PrismaClient({+ datasourceUrl,+ transactionOptions: {+ timeout,+ maxWait,+ },+ });+};+// this fixes the issue with `warn(prisma-client) There are already 10 instances of Prisma Client actively running.`// explanation here// https://www.prisma.io/docs/guides/database/troubleshooting-orm/help-articles/nextjs-prisma-client-dev-practices