diff --git a/src/drivers/AbstractDriver.ts b/src/drivers/AbstractDriver.ts index d0093ad..c0b3402 100644 --- a/src/drivers/AbstractDriver.ts +++ b/src/drivers/AbstractDriver.ts @@ -99,21 +99,31 @@ export abstract class AbstractDriver { }); let column1 = new ColumnInfo(); - column1.tsName = this.namingStrategy.entityName(namesOfRelatedTables[1]); + column1.tsName = this.namingStrategy.entityName( + namesOfRelatedTables[1] + ); let col1Rel = new RelationInfo(); col1Rel.relatedTable = namesOfRelatedTables[1]; - col1Rel.relatedColumn = this.namingStrategy.entityName(namesOfRelatedTables[1]); + col1Rel.relatedColumn = this.namingStrategy.entityName( + namesOfRelatedTables[1] + ); col1Rel.relationType = "ManyToMany"; col1Rel.isOwner = true; - col1Rel.ownerColumn = this.namingStrategy.entityName(namesOfRelatedTables[0]); + col1Rel.ownerColumn = this.namingStrategy.entityName( + namesOfRelatedTables[0] + ); column1.relations.push(col1Rel); relatedTable1.Columns.push(column1); let column2 = new ColumnInfo(); - column2.tsName = this.namingStrategy.entityName(namesOfRelatedTables[0]); + column2.tsName = this.namingStrategy.entityName( + namesOfRelatedTables[0] + ); let col2Rel = new RelationInfo(); col2Rel.relatedTable = namesOfRelatedTables[0]; - col2Rel.relatedColumn = this.namingStrategy.entityName(namesOfRelatedTables[1]); + col2Rel.relatedColumn = this.namingStrategy.entityName( + namesOfRelatedTables[1] + ); col2Rel.relationType = "ManyToMany"; col2Rel.isOwner = false; column2.relations.push(col2Rel); @@ -129,7 +139,7 @@ export abstract class AbstractDriver { password: string, schema: string, ssl: boolean, - namingStrategy:NamingStrategy + namingStrategy: NamingStrategy ): Promise { let dbModel = {}; this.namingStrategy = namingStrategy; @@ -267,10 +277,14 @@ export abstract class AbstractDriver { ownerRelation.relatedTable = relationTmp.referencedTable; ownerRelation.ownerTable = relationTmp.ownerTable; ownerRelation.relationType = isOneToMany - ? "ManyToOne" + ? "ManyToOne" : "OneToOne"; - let columnName = this.namingStrategy.relationName(ownerEntity,referencedEntity,isOneToMany); + let columnName = this.namingStrategy.relationName( + ownerEntity, + referencedEntity, + isOneToMany + ); ownerRelation.ownerColumn = columnName; ownerColumn.relations.push(ownerRelation); if (isOneToMany) { @@ -329,7 +343,9 @@ export abstract class AbstractDriver { entity.Columns.forEach(col => { if ( primaryIndex && - primaryIndex.columns.some(cIndex => cIndex.name == col.tsName) + primaryIndex.columns.some( + cIndex => cIndex.name == col.tsName + ) ) col.isPrimary = true; }); diff --git a/src/drivers/MssqlDriver.ts b/src/drivers/MssqlDriver.ts index b27052f..cf5517c 100644 --- a/src/drivers/MssqlDriver.ts +++ b/src/drivers/MssqlDriver.ts @@ -53,7 +53,9 @@ export class MssqlDriver extends AbstractDriver { }) .forEach(resp => { let colInfo: ColumnInfo = new ColumnInfo(); - colInfo.tsName = this.namingStrategy.entityName(resp.COLUMN_NAME); + colInfo.tsName = this.namingStrategy.entityName( + resp.COLUMN_NAME + ); colInfo.sqlName = resp.COLUMN_NAME; colInfo.is_nullable = resp.IS_NULLABLE == "YES"; colInfo.is_generated = resp.IsIdentity == 1; diff --git a/src/drivers/MysqlDriver.ts b/src/drivers/MysqlDriver.ts index 75cac77..f9cf700 100644 --- a/src/drivers/MysqlDriver.ts +++ b/src/drivers/MysqlDriver.ts @@ -45,7 +45,9 @@ export class MysqlDriver extends AbstractDriver { }) .forEach(resp => { let colInfo: ColumnInfo = new ColumnInfo(); - colInfo.tsName = this.namingStrategy.entityName(resp.COLUMN_NAME); + colInfo.tsName = this.namingStrategy.entityName( + resp.COLUMN_NAME + ); colInfo.sqlName = resp.COLUMN_NAME; colInfo.is_nullable = resp.IS_NULLABLE == "YES"; colInfo.is_generated = resp.IsIdentity == 1; diff --git a/src/drivers/OracleDriver.ts b/src/drivers/OracleDriver.ts index bf79fa5..a70456e 100644 --- a/src/drivers/OracleDriver.ts +++ b/src/drivers/OracleDriver.ts @@ -55,7 +55,9 @@ export class OracleDriver extends AbstractDriver { }) .forEach(resp => { let colInfo: ColumnInfo = new ColumnInfo(); - colInfo.tsName = this.namingStrategy.entityName(resp.COLUMN_NAME); + colInfo.tsName = this.namingStrategy.entityName( + resp.COLUMN_NAME + ); colInfo.sqlName = resp.COLUMN_NAME; colInfo.is_nullable = resp.NULLABLE == "Y"; colInfo.is_generated = resp.IDENTITY_COLUMN == "YES"; diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts index aa449f8..ed7879e 100644 --- a/src/drivers/PostgresDriver.ts +++ b/src/drivers/PostgresDriver.ts @@ -54,7 +54,9 @@ export class PostgresDriver extends AbstractDriver { }) .forEach(resp => { let colInfo: ColumnInfo = new ColumnInfo(); - colInfo.tsName = this.namingStrategy.entityName(resp.column_name); + colInfo.tsName = this.namingStrategy.entityName( + resp.column_name + ); colInfo.sqlName = resp.column_name; colInfo.is_nullable = resp.is_nullable == "YES"; colInfo.is_generated = resp.isidentity == "YES"; diff --git a/src/drivers/SqliteDriver.ts b/src/drivers/SqliteDriver.ts index 3409577..6f3b418 100644 --- a/src/drivers/SqliteDriver.ts +++ b/src/drivers/SqliteDriver.ts @@ -153,16 +153,12 @@ export class SqliteDriver extends AbstractDriver { ) && options ) { - colInfo.numericPrecision = ( - options[0] - .substring(1, options[0].length - 1) - .split(",")[0] - ); - colInfo.numericScale = ( - options[0] - .substring(1, options[0].length - 1) - .split(",")[1] - ); + colInfo.numericPrecision = options[0] + .substring(1, options[0].length - 1) + .split(",")[0]; + colInfo.numericScale = options[0] + .substring(1, options[0].length - 1) + .split(",")[1]; } if ( this.ColumnTypesWithLength.some( @@ -170,8 +166,9 @@ export class SqliteDriver extends AbstractDriver { ) && options ) { - colInfo.lenght = ( - options[0].substring(1, options[0].length - 1) + colInfo.lenght = options[0].substring( + 1, + options[0].length - 1 ); } if ( @@ -182,8 +179,9 @@ export class SqliteDriver extends AbstractDriver { ) && options ) { - colInfo.width = ( - options[0].substring(1, options[0].length - 1) + colInfo.width = options[0].substring( + 1, + options[0].length - 1 ); }