f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more cleaning up

Browse Source
This commit is contained in:
Kononnable 2018-12-08 18:58:16 +01:00
parent 721a85a0b9
commit d5faa8b9c3
5 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/drivers/MssqlDriver.ts
View File

@ -50,15 +50,15 @@ export class MssqlDriver extends AbstractDriver {
entities.forEach(ent => {
response
.filter(filterVal => {
return filterVal.TABLE_NAME == ent.EntityName;
return filterVal.TABLE_NAME === ent.EntityName;
})
.forEach(resp => {
const colInfo: ColumnInfo = new ColumnInfo();
colInfo.tsName = resp.COLUMN_NAME;
colInfo.sqlName = resp.COLUMN_NAME;
colInfo.isNullable = resp.IS_NULLABLE == "YES";
colInfo.isGenerated = resp.IsIdentity == 1;
colInfo.isUnique = resp.IsUnique == 1;
colInfo.isNullable = resp.IS_NULLABLE === "YES";
colInfo.isGenerated = resp.IsIdentity === 1;
colInfo.isUnique = resp.IsUnique === 1;
colInfo.default = resp.COLUMN_DEFAULT;
colInfo.sqlType = resp.DATA_TYPE;
switch (resp.DATA_TYPE) {
@ -174,7 +174,7 @@ export class MssqlDriver extends AbstractDriver {
if (
this.ColumnTypesWithPrecision.some(
v => v == colInfo.sqlType
v => v === colInfo.sqlType
)
) {
colInfo.numericPrecision = resp.NUMERIC_PRECISION;
@ -182,7 +182,7 @@ export class MssqlDriver extends AbstractDriver {
}
if (
this.ColumnTypesWithLength.some(
v => v == colInfo.sqlType
v => v === colInfo.sqlType
)
) {
colInfo.lenght =
@ -207,8 +207,8 @@ export class MssqlDriver extends AbstractDriver {
TableName: string;
IndexName: string;
ColumnName: string;
is_unique: number;
is_primary_key: number;
is_unique: boolean;
is_primary_key: boolean;
}> = (await request.query(`SELECT
TableName = t.name,
IndexName = ind.name,
@ -231,23 +231,23 @@ ORDER BY
t.name, ind.name, ind.index_id, ic.key_ordinal;`)).recordset;
entities.forEach(ent => {
response
.filter(filterVal => filterVal.TableName == ent.EntityName)
.filter(filterVal => filterVal.TableName === ent.EntityName)
.forEach(resp => {
let indexInfo: IndexInfo = {} as IndexInfo;
const indexColumnInfo: IndexColumnInfo = {} as IndexColumnInfo;
if (
ent.Indexes.filter(filterVal => {
return filterVal.name == resp.IndexName;
return filterVal.name === resp.IndexName;
}).length > 0
) {
indexInfo = ent.Indexes.filter(filterVal => {
return filterVal.name == resp.IndexName;
return filterVal.name === resp.IndexName;
})[0];
} else {
indexInfo.columns = [] as IndexColumnInfo[];
indexInfo.name = resp.IndexName;
indexInfo.isUnique = resp.is_unique == 1;
indexInfo.isPrimaryKey = resp.is_primary_key == 1;
indexInfo.isUnique = resp.is_unique;
indexInfo.isPrimaryKey = resp.is_primary_key;
ent.Indexes.push(indexInfo);
}
indexColumnInfo.name = resp.ColumnName;
@ -301,9 +301,9 @@ order by
const relationsTemp: IRelationTempInfo[] = [] as IRelationTempInfo[];
response.forEach(resp => {
let rels = relationsTemp.find(
val => val.object_id == resp.object_id
val => val.object_id === resp.object_id
);
if (rels == undefined) {
if (rels === undefined) {
rels = {} as IRelationTempInfo;
rels.ownerColumnsNames = [];
rels.referencedColumnsNames = [];

48
src/drivers/PostgresDriver.ts
View File

@ -32,7 +32,7 @@ export class PostgresDriver extends AbstractDriver {
numeric_precision: number;
numeric_scale: number;
isidentity: string;
isunique: number;
isunique: string;
}> = (await this.Connection
.query(`SELECT table_name,column_name,udt_name,column_default,is_nullable,
data_type,character_maximum_length,numeric_precision,numeric_scale,
@ -50,14 +50,14 @@ export class PostgresDriver extends AbstractDriver {
.rows;
entities.forEach(ent => {
response
.filter(filterVal => filterVal.table_name == ent.EntityName)
.filter(filterVal => filterVal.table_name === ent.EntityName)
.forEach(resp => {
const colInfo: ColumnInfo = new ColumnInfo();
colInfo.tsName = resp.column_name;
colInfo.sqlName = resp.column_name;
colInfo.isNullable = resp.is_nullable == "YES";
colInfo.isGenerated = resp.isidentity == "YES";
colInfo.isUnique = resp.isunique == 1;
colInfo.isNullable = resp.is_nullable === "YES";
colInfo.isGenerated = resp.isidentity === "YES";
colInfo.isUnique = resp.isunique === "1";
colInfo.default = colInfo.isGenerated
? null
: resp.column_default;
@ -68,8 +68,8 @@ export class PostgresDriver extends AbstractDriver {
);
if (!columnTypes.sql_type || !columnTypes.ts_type) {
if (
resp.data_type == "USER-DEFINED" ||
resp.data_type == "ARRAY"
resp.data_type === "USER-DEFINED" ||
resp.data_type === "ARRAY"
) {
TomgUtils.LogError(
`Unknown ${resp.data_type} column type: ${
@ -101,7 +101,7 @@ export class PostgresDriver extends AbstractDriver {
if (
this.ColumnTypesWithPrecision.some(
v => v == colInfo.sqlType
v => v === colInfo.sqlType
)
) {
colInfo.numericPrecision = resp.numeric_precision;
@ -109,7 +109,7 @@ export class PostgresDriver extends AbstractDriver {
}
if (
this.ColumnTypesWithLength.some(
v => v == colInfo.sqlType
v => v === colInfo.sqlType
)
) {
colInfo.lenght =
@ -119,7 +119,7 @@ export class PostgresDriver extends AbstractDriver {
}
if (
this.ColumnTypesWithWidth.some(
v => v == colInfo.sqlType
v => v === colInfo.sqlType
)
) {
colInfo.width =
@ -379,12 +379,12 @@ export class PostgresDriver extends AbstractDriver {
i.relname as indexname,
f.attname AS columnname,
CASE
WHEN ix.indisunique = true THEN '1'
ELSE '0'
WHEN ix.indisunique = true THEN 1
ELSE 0
END AS is_unique,
CASE
WHEN ix.indisprimary='true' THEN '1'
ELSE '0'
WHEN ix.indisprimary='true' THEN 1
ELSE 0
END AS is_primary_key
FROM pg_attribute f
JOIN pg_class c ON c.oid = f.attrelid
@ -400,27 +400,27 @@ export class PostgresDriver extends AbstractDriver {
ORDER BY c.relname,f.attname;`)).rows;
entities.forEach(ent => {
response
.filter(filterVal => filterVal.tablename == ent.EntityName)
.filter(filterVal => filterVal.tablename === ent.EntityName)
.forEach(resp => {
let indexInfo: IndexInfo = {} as IndexInfo;
const indexColumnInfo: IndexColumnInfo = {} as IndexColumnInfo;
if (
ent.Indexes.filter(
filterVal => filterVal.name == resp.indexname
filterVal => filterVal.name === resp.indexname
).length > 0
) {
indexInfo = ent.Indexes.find(
filterVal => filterVal.name == resp.indexname
filterVal => filterVal.name === resp.indexname
)!;
} else {
indexInfo.columns = [] as IndexColumnInfo[];
indexInfo.name = resp.indexname;
indexInfo.isUnique = resp.is_unique == 1;
indexInfo.isPrimaryKey = resp.is_primary_key == 1;
indexInfo.isUnique = resp.is_unique === 1;
indexInfo.isPrimaryKey = resp.is_primary_key === 1;
ent.Indexes.push(indexInfo);
}
indexColumnInfo.name = resp.columnname;
if (resp.is_primary_key == 0) {
if (resp.is_primary_key === 0) {
indexInfo.isPrimaryKey = false;
}
indexInfo.columns.push(indexColumnInfo);
@ -483,16 +483,16 @@ export class PostgresDriver extends AbstractDriver {
const relationsTemp: IRelationTempInfo[] = [] as IRelationTempInfo[];
response.forEach(resp => {
let rels = relationsTemp.find(
val => val.object_id == resp.object_id
val => val.object_id === resp.object_id
);
if (rels == undefined) {
if (rels === undefined) {
rels = {} as IRelationTempInfo;
rels.ownerColumnsNames = [];
rels.referencedColumnsNames = [];
rels.actionOnDelete =
resp.ondelete == "NO ACTION" ? null : resp.ondelete;
resp.ondelete === "NO ACTION" ? null : resp.ondelete;
rels.actionOnUpdate =
resp.onupdate == "NO ACTION" ? null : resp.onupdate;
resp.onupdate === "NO ACTION" ? null : resp.onupdate;
rels.object_id = resp.object_id;
rels.ownerTable = resp.tablewithforeignkey;
rels.referencedTable = resp.tablereferenced;

7
src/drivers/SqliteDriver.ts
View File

@ -136,7 +136,6 @@ export class SqliteDriver extends AbstractDriver {
colInfo.tsType = "Date";
break;
default:
console.log(colInfo.sqlType.toLowerCase().trim());
TomgUtils.LogError(
`Unknown column type: ${
colInfo.sqlType
@ -303,7 +302,11 @@ export class SqliteDriver extends AbstractDriver {
const promise = new Promise<boolean>((resolve, reject) => {
this.db = new this.sqlite.Database(dbName, err => {
if (err) {
console.error(err.message);
TomgUtils.LogError(
"Error connecting to SQLite database.",
false,
err.message
);
reject(err);
return;
}

1
src/index.ts
View File

@ -148,6 +148,7 @@ switch (argv.e) {
}
let namingStrategy: AbstractNamingStrategy;
if (argv.namingStrategy && argv.namingStrategy !== "") {
// tslint:disable-next-line:no-var-requires
const req = require(argv.namingStrategy);
namingStrategy = new req.NamingStrategy();
} else {

4
src/tslint.json
View File

@ -4,6 +4,8 @@
"tslint:recommended", "tslint-config-prettier"
],
"jsRules": {},
"rules": {},
"rules": {
"no-console":false
},
"rulesDirectory": []
}