refactor: knex config

Author: MartinKolarik

config/default.cjs

@@ -11,8 +11,9 @@ module.exports = {
 			tls: false,
 		},
 	},
-	sql: {
-		url: 'mysql://directus:password@localhost:3306/directus',
+	db: {
+		type: 'mysql',
+		connection: 'mysql://directus:password@localhost:3306/directus',
 	},
 	admin: {
 		key: '',

knexfile.js

@@ -0,0 +1,23 @@
+import _ from 'lodash';
+import config from 'config';
+
+const dbConfig = config.get('db');
+
+/**
+ * @typedef {import('knex').Knex.Config} KnexConfig
+ * @type {{ [key: string]: KnexConfig }}
+ */
+export default _.merge({}, ...[ 'development', 'production', 'staging', 'test' ].map((environment) => {
+	return {
+		[environment]: {
+			client: dbConfig.type,
+			connection: dbConfig.connection,
+			pool: {
+				min: 0,
+				max: 10,
+				propagateCreateError: false,
+			},
+			acquireConnectionTimeout: 10000,
+		},
+	};
+}));

src/lib/sql/client.ts

@@ -1,7 +1,6 @@
-import config from 'config';
 import knex, { Knex } from 'knex';
+import knexfile from '../../../knexfile.js';
 
-export const client: Knex = knex({
-	client: 'mysql',
-	connection: config.get<string>('sql.url'),
-});
+const env = process.env['NODE_ENV'] || 'development';
+
+export const client: Knex = knex(knexfile[env] || {});