fix(core): Fix bug running addUserActivatedColumn migration on MariaDB (

#6157)
n8n-io · May 3, 2023 · aa8e96d · aa8e96d
1 parent 6ca7482
commit aa8e96d
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts
@@ -25,13 +25,16 @@ export class AddUserActivatedProperty1681134145996 implements MigrationInterface
 						AND r.scope = 'workflow'`,
 		);
 
-		const updatedUsers = activatedUsers.map((user) =>
+		const updatedUsers = activatedUsers.map((user) => {
+			/*
+				MariaDB returns settings as a string and MySQL as a JSON
+			*/
+			const userSettings =
+				typeof user.settings === 'string' ? user.settings : JSON.stringify(user.settings);
 			queryRunner.query(
-				`UPDATE ${tablePrefix}user SET settings = '${JSON.stringify(user.settings)}' WHERE id = '${
-					user.id
-				}' `,
-			),
-		);
+				`UPDATE ${tablePrefix}user SET settings = '${userSettings}' WHERE id = '${user.id}' `,
+			);
+		});
 
 		await Promise.all(updatedUsers);