fix postgres migrations when custom schema is configured

n8n-io · May 27, 2022 · b645385 · b645385
1 parent c38f6af
commit b645385
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/packages/cli/src/databases/postgresdb/migrations/1587669153312-InitialMigration.ts b/packages/cli/src/databases/postgresdb/migrations/1587669153312-InitialMigration.ts
@@ -30,9 +30,9 @@ export class InitialMigration1587669153312 implements MigrationInterface {
 		}
 
 		await queryRunner.query(`DROP TABLE ${tablePrefix}workflow_entity`, undefined);
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefixIndex}c4d999a5e90784e8caccf5589d`, undefined);
+		await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixIndex}c4d999a5e90784e8caccf5589d`, undefined);
 		await queryRunner.query(`DROP TABLE ${tablePrefix}execution_entity`, undefined);
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefixIndex}07fde106c0b471d8cc80a64fc8`, undefined);
+		await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixIndex}07fde106c0b471d8cc80a64fc8`, undefined);
 		await queryRunner.query(`DROP TABLE ${tablePrefix}credentials_entity`, undefined);
 	}
 

diff --git a/packages/cli/src/databases/postgresdb/migrations/1594828256133-CreateIndexStoppedAt.ts b/packages/cli/src/databases/postgresdb/migrations/1594828256133-CreateIndexStoppedAt.ts
@@ -17,9 +17,9 @@ export class CreateIndexStoppedAt1594828256133 implements MigrationInterface {
 	}
 
 	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+		const tablePrefixPure = config.getEnv('database.tablePrefix');
 
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}33228da131bb1112247cf52a42`);
+		await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixPure}33228da131bb1112247cf52a42`);
 	}
 
 }
diff --git a/packages/cli/src/databases/postgresdb/migrations/1611144599516-AddWebhookId.ts b/packages/cli/src/databases/postgresdb/migrations/1611144599516-AddWebhookId.ts
@@ -25,7 +25,7 @@ export class AddWebhookId1611144599516 implements MigrationInterface {
 			tablePrefix = schema + '.' + tablePrefix;
 		}
 
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefixPure}16f4436789e804e3e1c9eeb240`);
+		await queryRunner.query(`DROP "${schema}".INDEX IDX_${tablePrefixPure}16f4436789e804e3e1c9eeb240`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "pathLength"`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "webhookId"`);
 	}

diff --git a/packages/cli/src/databases/postgresdb/migrations/1617270242566-CreateTagEntity.ts b/packages/cli/src/databases/postgresdb/migrations/1617270242566-CreateTagEntity.ts
@@ -66,10 +66,10 @@ export class CreateTagEntity1617270242566 implements MigrationInterface {
 
 			await queryRunner.query(`ALTER TABLE ${tablePrefix}workflows_tags DROP CONSTRAINT "FK_${tablePrefixPure}5e29bfe9e22c5d6567f509d4a46"`);
 			await queryRunner.query(`ALTER TABLE ${tablePrefix}workflows_tags DROP CONSTRAINT "FK_${tablePrefixPure}31140eb41f019805b40d0087449"`);
-			await queryRunner.query(`DROP INDEX IDX_${tablePrefixPure}5e29bfe9e22c5d6567f509d4a4`);
-			await queryRunner.query(`DROP INDEX IDX_${tablePrefixPure}31140eb41f019805b40d008744`);
+			await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixPure}5e29bfe9e22c5d6567f509d4a4`);
+			await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixPure}31140eb41f019805b40d008744`);
 			await queryRunner.query(`DROP TABLE ${tablePrefix}workflows_tags`);
-			await queryRunner.query(`DROP INDEX IDX_${tablePrefixPure}812eb05f7451ca757fb98444ce`);
+			await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixPure}812eb05f7451ca757fb98444ce`);
 			await queryRunner.query(`DROP TABLE ${tablePrefix}tag_entity`);
 		}
 

diff --git a/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts b/packages/cli/src/databases/postgresdb/migrations/1620824779533-UniqueWorkflowNames.ts
@@ -65,6 +65,6 @@ export class UniqueWorkflowNames1620824779533 implements MigrationInterface {
 			tablePrefix = schema + '.' + tablePrefix;
 		}
 
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefixPure}a252c527c4c89237221fe2c0ab"`);
+		await queryRunner.query(`DROP INDEX "${schema}"."IDX_${tablePrefixPure}a252c527c4c89237221fe2c0ab"`);
 	}
 }
diff --git a/packages/cli/src/databases/postgresdb/migrations/1626176912946-AddwaitTill.ts b/packages/cli/src/databases/postgresdb/migrations/1626176912946-AddwaitTill.ts
@@ -24,7 +24,7 @@ export class AddwaitTill1626176912946 implements MigrationInterface {
 			tablePrefix = schema + '.' + tablePrefix;
 		}
 
-		await queryRunner.query(`DROP INDEX IDX_${tablePrefixPure}ca4a71b47f28ac6ea88293a8e2`);
+		await queryRunner.query(`DROP INDEX "${schema}".IDX_${tablePrefixPure}ca4a71b47f28ac6ea88293a8e2`);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}webhook_entity DROP COLUMN "waitTill"`);
 	}
 

diff --git a/packages/cli/src/databases/postgresdb/migrations/1646834195327-IncreaseTypeVarcharLimit.ts b/packages/cli/src/databases/postgresdb/migrations/1646834195327-IncreaseTypeVarcharLimit.ts
@@ -9,7 +9,12 @@ export class IncreaseTypeVarcharLimit1646834195327 implements MigrationInterface
 	name = 'IncreaseTypeVarcharLimit1646834195327';
 
 	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+		let tablePrefix = config.getEnv('database.tablePrefix');
+		const tablePrefixPure = tablePrefix;
+		const schema = config.getEnv('database.postgresdb.schema');
+		if (schema) {
+			tablePrefix = schema + '.' + tablePrefix;
+		}
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}credentials_entity ALTER COLUMN "type" TYPE VARCHAR(128)`);
 	}
 

diff --git a/packages/cli/src/databases/postgresdb/migrations/1646992772331-CreateUserManagement.ts b/packages/cli/src/databases/postgresdb/migrations/1646992772331-CreateUserManagement.ts
@@ -56,12 +56,12 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 				CONSTRAINT "FK_${tablePrefixPure}3540da03964527aa24ae014b780" FOREIGN KEY ("roleId") REFERENCES ${tablePrefix}role ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
 				CONSTRAINT "FK_${tablePrefixPure}82b2fd9ec4e3e24209af8160282" FOREIGN KEY ("userId") REFERENCES ${tablePrefix}user ("id") ON DELETE CASCADE ON UPDATE NO ACTION,
 				CONSTRAINT "FK_${tablePrefixPure}b83f8d2530884b66a9c848c8b88" FOREIGN KEY ("workflowId") REFERENCES
-				${tablePrefixPure}workflow_entity ("id") ON DELETE CASCADE ON UPDATE NO ACTION
+				${tablePrefix}workflow_entity ("id") ON DELETE CASCADE ON UPDATE NO ACTION
 			);`,
 		);
 
 		await queryRunner.query(
-			`CREATE INDEX "IDX_${tablePrefixPure}65a0933c0f19d278881653bf81d35064" ON "shared_workflow" ("workflowId");`,
+			`CREATE INDEX "IDX_${tablePrefixPure}65a0933c0f19d278881653bf81d35064" ON ${tablePrefix}"shared_workflow" ("workflowId");`,
 		);
 
 		await queryRunner.query(
@@ -91,7 +91,7 @@ export class CreateUserManagement1646992772331 implements MigrationInterface {
 			);`,
 		);
 
-		await queryRunner.query(`DROP INDEX "IDX_${tablePrefixPure}a252c527c4c89237221fe2c0ab"`);
+		await queryRunner.query(`DROP INDEX "${schema}"."IDX_${tablePrefixPure}a252c527c4c89237221fe2c0ab"`);
 
 		// Insert initial roles
 		await queryRunner.query(