From 92dde65e7042047ee33bda3512676ef37116d334 Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Wed, 16 Feb 2022 07:52:15 -0700 Subject: [PATCH 1/3] Fix MySQL error on DigitalOcean by temp disabling requirement on session Signed-off-by: Derrick Mehaffy --- packages/core/database/lib/dialects/mysql/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/database/lib/dialects/mysql/index.js b/packages/core/database/lib/dialects/mysql/index.js index 81fdb31bf1f..086de83cae3 100644 --- a/packages/core/database/lib/dialects/mysql/index.js +++ b/packages/core/database/lib/dialects/mysql/index.js @@ -32,6 +32,10 @@ class MysqlDialect extends Dialect { }; } + async initialize() { + await this.db.connection.raw(`set session sql_require_primary_key = 0;`); + } + async startSchemaUpdate() { await this.db.connection.raw(`set foreign_key_checks = 0;`); } From 6f73f6772e4220906826608078fb6f26eafb036a Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Wed, 23 Feb 2022 08:06:40 -0700 Subject: [PATCH 2/3] fix: add try catch to pk check --- packages/core/database/lib/dialects/mysql/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/core/database/lib/dialects/mysql/index.js b/packages/core/database/lib/dialects/mysql/index.js index 086de83cae3..f9aa4cfb04b 100644 --- a/packages/core/database/lib/dialects/mysql/index.js +++ b/packages/core/database/lib/dialects/mysql/index.js @@ -33,7 +33,11 @@ class MysqlDialect extends Dialect { } async initialize() { - await this.db.connection.raw(`set session sql_require_primary_key = 0;`); + try { + await this.db.connection.raw(`set session sql_require_primary_key = 0;`); + } catch (err) { + console.error({ err }); + } } async startSchemaUpdate() { From 9d5ba5b3237b1fe64d02c656c6d9b7239299ff29 Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Wed, 23 Feb 2022 13:05:59 -0700 Subject: [PATCH 3/3] fix: empty catch block for primary key rule --- packages/core/database/lib/dialects/mysql/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/database/lib/dialects/mysql/index.js b/packages/core/database/lib/dialects/mysql/index.js index f9aa4cfb04b..8a6fd85b957 100644 --- a/packages/core/database/lib/dialects/mysql/index.js +++ b/packages/core/database/lib/dialects/mysql/index.js @@ -36,7 +36,7 @@ class MysqlDialect extends Dialect { try { await this.db.connection.raw(`set session sql_require_primary_key = 0;`); } catch (err) { - console.error({ err }); + // Ignore error due to lack of session permissions } }