oreolek/nmig
1
0
Fork 0
Code Releases Activity

migrating to typescript

Browse source
This commit is contained in:
Anatoly 2018-09-03 01:35:11 +03:00
parent 01122b2407
commit f9a04703ef
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/DBAccess.ts
View file

@ -88,7 +88,7 @@ export default class DBAccess {
this._getMysqlConnection();
return new Promise<PoolConnection>((resolve, reject) => {
(<MySQLPool>this._conversion._mysql).getConnection((err: MysqlError|null, connection: PoolConnection) => {
(<MySQLPool>this._conversion._mysql).getConnection((err: MysqlError | null, connection: PoolConnection) => {
return err ? reject(err) : resolve(connection);
});
});
@ -114,9 +114,9 @@ export default class DBAccess {
/**
* Releases MySQL or PostgreSQL connection back to appropriate pool.
*/
public releaseDbClient(dbClient?: PoolConnection|PoolClient): void {
public releaseDbClient(dbClient?: PoolConnection | PoolClient): void {
try {
(<PoolConnection|PoolClient>dbClient).release();
(<PoolConnection | PoolClient>dbClient).release();
dbClient = undefined;
} catch (error) {
generateError(this._conversion, `\t--[DBAccess::releaseDbClient] ${ error }`);
@ -127,7 +127,7 @@ export default class DBAccess {
* Checks if there are no more queries to be sent using current client.
* In such case the client should be released.
*/
private _releaseDbClientIfNecessary(client: PoolConnection|PoolClient, shouldHoldClient: boolean): void {
private _releaseDbClientIfNecessary(client: PoolConnection | PoolClient, shouldHoldClient: boolean): void {
if (!shouldHoldClient) {
this.releaseDbClient(client);
}
@ -143,7 +143,7 @@ export default class DBAccess {
vendor: DBVendors,
processExitOnError: boolean,
shouldReturnClient: boolean,
client?: PoolConnection|PoolClient,
client?: PoolConnection | PoolClient,
bindings?: any[]
): Promise<DBAccessQueryResult> {
// Checks if there is an available client.
@ -180,7 +180,7 @@ export default class DBAccess {
sql = (<PoolConnection>client).format(sql, bindings);
}
(<PoolConnection>client).query(sql, (error: MysqlError|null, data: any) => {
(<PoolConnection>client).query(sql, (error: MysqlError | null, data: any) => {
this._releaseDbClientIfNecessary((<PoolConnection>client), shouldReturnClient);
if (error) {

2
src/DBAccessQueryResult.ts
View file

@ -26,7 +26,7 @@ export default interface DBAccessQueryResult {
* MySQL's or PostgreSQL's client instance.
* The client may be undefined.
*/
client?: PoolConnection|PoolClient;
client?: PoolConnection | PoolClient;
/**
* Query result.

2
src/Logger.ts
View file

@ -26,7 +26,7 @@ import Conversion from './Conversion';
* Writes given log to the "/all.log" file.
* If necessary, writes given log to the "/{tableName}.log" file.
*/
export default (conversion: Conversion, log: string|NodeJS.ErrnoException, tableLogPath?: string, isErrorLog?: boolean): void => {
export default (conversion: Conversion, log: string | NodeJS.ErrnoException, tableLogPath?: string, isErrorLog?: boolean): void => {
const buffer: Buffer = Buffer.from(`${log}\n\n`, conversion._encoding);
if (!isErrorLog) {

2
test/TestModules/TestSchemaProcessor.ts
View file

@ -209,7 +209,7 @@ export default class TestSchemaProcessor {
* Initializes Conversion instance.
*/
public async initializeConversion(): Promise<Conversion> {
const baseDir: string = path.join(__dirname, '..', '..');
const baseDir: string = path.join(__dirname, '..', '..', '..');
const config: any = await this._app.readConfig(baseDir, 'test_config.json');
const fullConfig: any = await this._app.readExtraConfig(config, baseDir);
this.conversion = await this._app.initializeConversion(fullConfig);