Skip to content

Commit c09545f

Browse files
committed
feat(common): APPEX-167 Fix MySQL support for generic mysql servers
1 parent fb2b510 commit c09545f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

lib/dbs/mysql.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,17 @@ import * as mysql from 'mysql';
22
import { promisify } from 'util';
33
import { SessionProps, StoreData } from '../../types';
44

5+
const MYSQL_CONFIG = {
6+
host: process.env.MYSQL_HOST,
7+
database: process.env.MYSQL_DATABASE,
8+
user: process.env.MYSQL_USERNAME,
9+
password: process.env.MYSQL_PASSWORD,
10+
...(process.env.MYSQL_PORT && { port: process.env.MYSQL_PORT }),
11+
};
12+
513
// For use with Heroku ClearDB
614
// Other mysql: https://www.npmjs.com/package/mysql#establishing-connections
7-
const connection = mysql.createConnection(process.env.CLEARDB_DATABASE_URL);
15+
const connection = mysql.createConnection(process.env.CLEARDB_DATABASE_URL ? process.env.CLEARDB_DATABASE_URL : MYSQL_CONFIG);
816
const query = promisify(connection.query.bind(connection));
917

1018
// Use setUser for storing global user data (persists between installs)

scripts/db.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
const mysql = require('mysql');
22
const util = require('util');
33

4-
const connection = mysql.createConnection(process.env.CLEARDB_DATABASE_URL);
4+
const MYSQL_CONFIG = {
5+
host: process.env.MYSQL_HOST,
6+
database: process.env.MYSQL_DATABASE,
7+
user: process.env.MYSQL_USERNAME,
8+
password: process.env.MYSQL_PASSWORD,
9+
...(process.env.MYSQL_PORT && { port: process.env.MYSQL_PORT }),
10+
};
11+
12+
const connection = mysql.createConnection(process.env.CLEARDB_DATABASE_URL ? process.env.CLEARDB_DATABASE_URL : MYSQL_CONFIG);
513
const query = util.promisify(connection.query.bind(connection));
614

715
const usersCreate = query('CREATE TABLE `users` (\n' +

0 commit comments

Comments
 (0)