Compare commits

...

2 Commits

Author SHA1 Message Date
d6e1ed4d1e revert docker compose changes 2024-11-14 23:10:54 -07:00
1295b68d80 Fix ca version migration
We didn't do a check to see if the column already exists. Because of this, we get this error during migrations:

```
| migration file "20240802181855_ca-cert-version.ts" failed
infisical-db-migration  | migration failed with error: alter table "certificates" add column "caCertId" uuid null - column "caCertId" of relation "certificates" already exists
```
2024-11-14 23:07:30 -07:00
2 changed files with 13 additions and 11 deletions

View File

@ -64,23 +64,25 @@ export async function up(knex: Knex): Promise<void> {
} }
if (await knex.schema.hasTable(TableName.Certificate)) { if (await knex.schema.hasTable(TableName.Certificate)) {
await knex.schema.alterTable(TableName.Certificate, (t) => { const hasCaCertIdColumn = await knex.schema.hasColumn(TableName.Certificate, "caCertId");
t.uuid("caCertId").nullable(); if (!hasCaCertIdColumn) {
t.foreign("caCertId").references("id").inTable(TableName.CertificateAuthorityCert); await knex.schema.alterTable(TableName.Certificate, (t) => {
}); t.uuid("caCertId").nullable();
t.foreign("caCertId").references("id").inTable(TableName.CertificateAuthorityCert);
});
await knex.raw(` await knex.raw(`
UPDATE "${TableName.Certificate}" cert UPDATE "${TableName.Certificate}" cert
SET "caCertId" = ( SET "caCertId" = (
SELECT caCert.id SELECT caCert.id
FROM "${TableName.CertificateAuthorityCert}" caCert FROM "${TableName.CertificateAuthorityCert}" caCert
WHERE caCert."caId" = cert."caId" WHERE caCert."caId" = cert."caId"
) )`);
`);
await knex.schema.alterTable(TableName.Certificate, (t) => { await knex.schema.alterTable(TableName.Certificate, (t) => {
t.uuid("caCertId").notNullable().alter(); t.uuid("caCertId").notNullable().alter();
}); });
}
} }
} }

View File

@ -69,4 +69,4 @@ volumes:
driver: local driver: local
networks: networks:
infisical: infisical: