diff --git a/migrate_to_db.sh b/migrate_to_db.sh new file mode 100644 index 0000000..dd0d3f1 --- /dev/null +++ b/migrate_to_db.sh @@ -0,0 +1 @@ +npx drizzle-kit migrate diff --git a/migration-correction-script.sh b/migration-correction-script.sh new file mode 100644 index 0000000..276eaf6 --- /dev/null +++ b/migration-correction-script.sh @@ -0,0 +1,5 @@ +set -ex +for f in src/app/db/migrations/*.sql; do + hash=$(sha256sum "$f" | awk '{print $1}') + echo "INSERT INTO __drizzle_migrations (hash, created_at) SELECT '$hash', extract(epoch from now())::bigint * 1000 WHERE NOT EXISTS (SELECT 1 FROM __drizzle_migrations WHERE hash = '$hash');" +done diff --git a/package.json b/package.json index eae3d63..82682d5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test:e2e:open": "start-server-and-test dev http://localhost:3000 \"cypress open --e2e\"", "test:e2e:run": "cypress run", "migration:generate": "drizzle-kit generate", - "migration:push": "drizzle-kit push", + "migration:migrate": "drizzle-kit migrate", "create_user": "tsx src/app/db/create_user.ts" }, "dependencies": { diff --git a/push_to_db.sh b/push_to_db.sh deleted file mode 100644 index f243f3e..0000000 --- a/push_to_db.sh +++ /dev/null @@ -1 +0,0 @@ -npx drizzle-kit push diff --git a/src/app/db/migrations/0220_glamorous_phantom_reporter.sql b/src/app/db/migrations/0220_round_retro_girl.sql similarity index 99% rename from src/app/db/migrations/0220_glamorous_phantom_reporter.sql rename to src/app/db/migrations/0220_round_retro_girl.sql index 74bed70..6aafdea 100644 --- a/src/app/db/migrations/0220_glamorous_phantom_reporter.sql +++ b/src/app/db/migrations/0220_round_retro_girl.sql @@ -1,5 +1,5 @@ CREATE TYPE "public"."rebaseline_reason" AS ENUM('none', 'pre_sap10', 'physical_state_changed', 'both');--> statement-breakpoint -ALTER TYPE "public"."file_type" ADD VALUE 'other';--> statement-breakpoint +ALTER TYPE "public"."file_type" ADD VALUE IF NOT EXISTS 'other';--> statement-breakpoint CREATE TABLE "epc_renewable_heat_incentive" ( "id" bigserial PRIMARY KEY NOT NULL, "epc_property_id" bigint NOT NULL, diff --git a/src/app/db/migrations/meta/0220_snapshot.json b/src/app/db/migrations/meta/0220_snapshot.json index fa535d2..20261af 100644 --- a/src/app/db/migrations/meta/0220_snapshot.json +++ b/src/app/db/migrations/meta/0220_snapshot.json @@ -1,5 +1,5 @@ { - "id": "2e1be8b1-cd76-4951-9e53-f4e21e4ccec1", + "id": "4b32b79f-ba72-4512-9214-9335d7f1239c", "prevId": "07dbe008-1c2a-4d52-b27a-74f9e68fa596", "version": "7", "dialect": "postgresql", diff --git a/src/app/db/migrations/meta/_journal.json b/src/app/db/migrations/meta/_journal.json index 4d291ab..8dff795 100644 --- a/src/app/db/migrations/meta/_journal.json +++ b/src/app/db/migrations/meta/_journal.json @@ -1255,13 +1255,6 @@ "tag": "0178_parched_midnight", "breakpoints": true }, - { - "idx": 179, - "version": "7", - "when": 1776459924335, - "tag": "0179_mighty_cardiac", - "breakpoints": true - }, { "idx": 180, "version": "7", @@ -1545,8 +1538,8 @@ { "idx": 220, "version": "7", - "when": 1780483404142, - "tag": "0220_glamorous_phantom_reporter", + "when": 1780491109956, + "tag": "0220_round_retro_girl", "breakpoints": true } ]