Change PostgreSQL initialization code as well as MySQL code

Author: MIYASHITA, Akihiro

lib/connection.js

@@ -141,69 +141,17 @@ class SQLiteCasette {
 
 class PostgreSQLCasette {
 	async newConnection(options) {
-		async function startServer() {
-			return new Promise((_res, _rej) => {
-				let done = false;
-				const res = (...args) => {
-					if (!done) {
-						done = true;
-						_res(...args);
-					}
-				}
-				const rej = (...args) => {
-					if (!done) {
-						done = true;
-						_rej(...args);
-					}
-				}
-				sleep(10000).then(() => rej(new Error('Timeout database connection')));
-				const p = cp.spawn('docker-entrypoint.sh', ['postgres'], {
-					detached: true,
-				});
-				p.stdout.on('data', data => {
-					const message = data.toString();
-					if (options.verbose) {
-						console.log(message);
-					}
-					if (message.includes('database system is ready to accept connections')) {
-						res();
-					}
-				});
-				p.stderr.on('data', data => {
-					const message = data.toString();
-					if (options.verbose) {
-						console.error(message);
-					}
-					if (message.includes('database system is ready to accept connections')) {
-						res();
-					}
-				});
-			});
-		}
-
-		if (!fs.existsSync('/var/run/postgresql/.s.PGSQL.5432')) {
-			for (let retries = 5; retries > 0; retries--) {
-				try {
-					await startServer();
-					break;
-				} catch (e) {
-					if (options.verbose) {
-						console.error(e);
-					}
-				}
-				await sleep(1000);
-			}
-		}
-
-		for (let retries = 20; retries > 0; retries--) {
+		for (let retries = 10; retries > 0; retries--) {
 			try {
+				await exec('service postgresql start');
 				const conn = knex({
 					client: 'pg',
 					connection: {
 						host: '127.0.0.1',
-						user: 'postgres',
-						database: 'postgres',
+						port: 5432,
+						user: 'track',
 						password: 'password',
+						database: 'track',
 					},
 				});
 				await conn.raw("SELECT 1");

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "track-db-test-library",
-  "version": "2.6.0-rc5",
+  "version": "2.6.0-rc6",
   "description": "Test utility for Track database challenges",
   "main": "index.js",
   "scripts": {