fix

Author: MIYASHITA, Akihiro

lib/connection.js

@@ -78,6 +78,9 @@ class SQLiteCasette {
 			useNullAsDefault: true
 		});
 	}
+	rows(result) {
+		return result;
+	}
 	explainSql(s) {
 		return `EXPLAIN QUERY PLAN ${s}`;
 	}
@@ -223,6 +226,9 @@ class PostgreSQLCasette {
 		}
 		throw Error("Failed to start PostgreSQL server");
 	}
+	rows(result) {
+		return result.rows;
+	}
 	explainSql(s) {
 		return `EXPLAIN ${s}`;
 	}
@@ -264,49 +270,9 @@ class PostgreSQLCasette {
 
 class MySQLCassette {
 	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('service', ['mysql', 'start'], {
-					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();
-					}
-				});
-			});
-		}
-
 		for (let retries = 10; retries > 0; retries--) {
 			try {
-				await startServer();
+				exec('service mysql start');
 				const conn = knex({
 					client: 'mysql',
 					connection: {
@@ -321,7 +287,7 @@ class MySQLCassette {
 				if (options && options.clean) {
 					try {
 						let tables = await conn.raw("SHOW TABLES");
-						for (let table of tables.rows) {
+						for (let table of tables[0]) {
 							await conn.raw(`DROP TABLE IF EXISTS ${table.Tables_in_track} CASCADE`);
 						}
 					} catch (e2) { console.error(e2); }
@@ -333,6 +299,9 @@ class MySQLCassette {
 		}
 		throw Error("Failed to start MySQL server");
 	}
+	rows(result) {
+		return result[0];
+	}
 	explainSql(s) {
 		return `EXPLAIN ${s}`;
 	}
@@ -534,24 +503,19 @@ class Connection {
 	 * @returns {Promise<Array<object>?>}
 	 */
 	async query(sql, opt_args) {
-
-		function rows(records) {
-			return !!records.rows ? records.rows /* postgres */ : records /* sqlite */
-		}
-
 		if (sql.trim().length === 0) {
 			throw 'Empty query';
 		}
 
 		const isSelectStatement = /^\s*SELECT /i.test(sql);
 		if (isSelectStatement) {
-			const count = rows(await this._conn.raw(`SELECT count(1) AS count FROM (${sql.replace(/;\s*$/, "")}) AS x`, opt_args)).length;
+			const count = this._cassette.rows(await this._conn.raw(`SELECT count(1) AS count FROM (${sql.replace(/;\s*$/, "")}) AS x`, opt_args)).length;
 			if (count > (this._options.maxRows || 10000)) {
 				throw 'Too many records';
 			}
 		}
 
-		return rows(await this._conn.raw(sql, opt_args));
+		return this._cassette.rows(await this._conn.raw(sql, opt_args));
 	}
 
 	/**

package-lock.json

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