From 258836a605fede938b8e340327a5735609ab1350 Mon Sep 17 00:00:00 2001 From: x032205 Date: Thu, 8 May 2025 01:17:47 -0400 Subject: [PATCH 1/2] migration tweak --- .../20250429232917_store-cert-secret-key-and-chain.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts b/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts index cb5e44a03..1bab10ee8 100644 --- a/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts +++ b/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts @@ -3,7 +3,10 @@ import { Knex } from "knex"; import { TableName } from "../schemas"; export async function up(knex: Knex): Promise { - if (await knex.schema.hasTable(TableName.CertificateBody)) { + if ( + (await knex.schema.hasTable(TableName.CertificateBody)) && + !(await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain")) + ) { await knex.schema.alterTable(TableName.CertificateBody, (t) => { t.binary("encryptedCertificateChain").nullable(); }); @@ -25,7 +28,10 @@ export async function down(knex: Knex): Promise { await knex.schema.dropTable(TableName.CertificateSecret); } - if (await knex.schema.hasTable(TableName.CertificateBody)) { + if ( + (await knex.schema.hasTable(TableName.CertificateBody)) && + (await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain")) + ) { await knex.schema.alterTable(TableName.CertificateBody, (t) => { t.dropColumn("encryptedCertificateChain"); }); From ab0b8c0f10de8ab4b8d4a22b24bbdde0ee74c5ad Mon Sep 17 00:00:00 2001 From: x032205 Date: Thu, 8 May 2025 01:22:34 -0400 Subject: [PATCH 2/2] migration tweak --- .../20250429232917_store-cert-secret-key-and-chain.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts b/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts index 1bab10ee8..f90b2d593 100644 --- a/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts +++ b/backend/src/db/migrations/20250429232917_store-cert-secret-key-and-chain.ts @@ -3,10 +3,7 @@ import { Knex } from "knex"; import { TableName } from "../schemas"; export async function up(knex: Knex): Promise { - if ( - (await knex.schema.hasTable(TableName.CertificateBody)) && - !(await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain")) - ) { + if (!(await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain"))) { await knex.schema.alterTable(TableName.CertificateBody, (t) => { t.binary("encryptedCertificateChain").nullable(); }); @@ -28,10 +25,7 @@ export async function down(knex: Knex): Promise { await knex.schema.dropTable(TableName.CertificateSecret); } - if ( - (await knex.schema.hasTable(TableName.CertificateBody)) && - (await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain")) - ) { + if (await knex.schema.hasColumn(TableName.CertificateBody, "encryptedCertificateChain")) { await knex.schema.alterTable(TableName.CertificateBody, (t) => { t.dropColumn("encryptedCertificateChain"); });