Page MenuHomePhabricator
Files F2905584

D4833.id15621.diff
No OneTemporary
Actions

D4833.id15621.diff
View Options

diff --git a/keyserver/src/database/db-config.js b/keyserver/src/database/db-config.js
--- a/keyserver/src/database/db-config.js
+++ b/keyserver/src/database/db-config.js
@@ -4,7 +4,7 @@
import { importJSON } from '../utils/import-json';
-type DBType = 'mysql5.7' | 'mariadb10.8';
+type DBType = 'mariadb10.8';
export type DBConfig = {
+host: string,
+user: string,
@@ -14,13 +14,20 @@
};
function assertValidDBType(dbType: ?string): DBType {
- if (!dbType) {
- return 'mysql5.7';
- }
invariant(
- dbType === 'mysql5.7' || dbType === 'mariadb10.8',
- `${dbType} is not a valid dbType`,
+ dbType,
+ 'dbType not specified in DB config. Following the MySQL deprecation this ' +
+ 'is a required parameter. Please follow this Gist to migrate to ' +
+ 'MariaDB: ' +
+ 'https://gist.github.com/Ashoat/3a5ded2549db082c5516606f3c3c5da5',
+ );
+ invariant(
+ dbType !== 'mysql5.7',
+ 'We no longer support MySQL. Please follow this Gist to migrate to ' +
+ 'MariaDB: ' +
+ 'https://gist.github.com/Ashoat/3a5ded2549db082c5516606f3c3c5da5',
);
+ invariant(dbType === 'mariadb10.8', `${dbType} is not a valid dbType`);
return dbType;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 7, 6:46 AM (21 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2252708
Default Alt Text
D4833.id15621.diff (1 KB)

Event Timeline