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

Replaced "Object" with "object" for the generated JSON column type, so that TSLint does not complain about it being too general, while still preserving the same semantics.

Browse Source
This commit is contained in:
Vasil Rangelov 2019-06-20 15:54:33 +03:00
parent b70aba10c8
commit 4868dcbdfa
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/MysqlDriver.ts
View File

@ -163,7 +163,7 @@ export class MysqlDriver extends AbstractDriver {
).replace(/\'/gi, '"');
break;
case "json":
colInfo.tsType = "Object";
colInfo.tsType = "object";
break;
case "binary":
colInfo.tsType = "Buffer";

14
src/drivers/PostgresDriver.ts
View File

@ -159,8 +159,8 @@ export class PostgresDriver extends AbstractDriver {
| "boolean"
| "Date"
| "Buffer"
| "Object"
| "string | Object"
| "object"
| "string | object"
| "string | string[]"
| "any"
| null;
@ -288,7 +288,7 @@ export class PostgresDriver extends AbstractDriver {
ret.ts_type = "string";
break;
case "point":
ret.ts_type = "string | Object";
ret.ts_type = "string | object";
break;
case "line":
ret.ts_type = "string";
@ -297,7 +297,7 @@ export class PostgresDriver extends AbstractDriver {
ret.ts_type = "string | string[]";
break;
case "box":
ret.ts_type = "string | Object";
ret.ts_type = "string | object";
break;
case "path":
ret.ts_type = "string";
@ -306,7 +306,7 @@ export class PostgresDriver extends AbstractDriver {
ret.ts_type = "string";
break;
case "circle":
ret.ts_type = "string | Object";
ret.ts_type = "string | object";
break;
case "cidr":
ret.ts_type = "string";
@ -330,10 +330,10 @@ export class PostgresDriver extends AbstractDriver {
ret.ts_type = "string";
break;
case "json":
ret.ts_type = "Object";
ret.ts_type = "object";
break;
case "jsonb":
ret.ts_type = "Object";
ret.ts_type = "object";
break;
case "int4range":
ret.ts_type = "string";

4
src/models/ColumnInfo.ts
View File

@ -10,8 +10,8 @@ export class ColumnInfo {
| "boolean"
| "Date"
| "Buffer"
| "Object"
| "string | Object"
| "object"
| "string | object"
| "string | string[]"
| "any";
public relations: RelationInfo[] = [];

2
test/integration/entityTypes/mariadb/entity/Post.ts
View File

@ -89,7 +89,7 @@ export class Post {
// In mariaDb Json is recognized as longtext
// @Column("json")
// json: Object;
// json: object;
@Column("binary")
binary: Buffer;

6
test/integration/entityTypes/postgres/entity/Post.ts
View File

@ -123,7 +123,7 @@ export class Post {
// enum: string;
@Column("point")
point: string | Object;
point: string | object;
@Column("line")
line: string;
@ -132,7 +132,7 @@ export class Post {
lseg: string | string[];
@Column("box")
box: string | Object;
box: string | object;
@Column("path")
path: string;
@ -141,7 +141,7 @@ export class Post {
polygon: string;
@Column("circle")
circle: string | Object;
circle: string | object;
@Column("cidr")
cidr: string;