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

Merge pull request #152 from jasonvideoblocks/mysql-enum

Browse Source 
#147: Fix case-sensitive column names
This commit is contained in:
Kononnable 2019-03-09 20:08:08 +01:00 committed by GitHub
commit b9332736ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/MysqlDriver.ts
View File

@ -46,11 +46,11 @@ export class MysqlDriver extends AbstractDriver {
NUMERIC_PRECISION: number;
NUMERIC_SCALE: number;
IsIdentity: number;
column_type: string;
column_key: string;
COLUMN_TYPE: string;
COLUMN_KEY: string;
}>(`SELECT TABLE_NAME,COLUMN_NAME,COLUMN_DEFAULT,IS_NULLABLE,
DATA_TYPE,CHARACTER_MAXIMUM_LENGTH,NUMERIC_PRECISION,NUMERIC_SCALE,
CASE WHEN EXTRA like '%auto_increment%' THEN 1 ELSE 0 END IsIdentity, column_type, column_key
CASE WHEN EXTRA like '%auto_increment%' THEN 1 ELSE 0 END IsIdentity, COLUMN_TYPE, COLUMN_KEY
FROM INFORMATION_SCHEMA.COLUMNS where TABLE_SCHEMA IN (${this.escapeCommaSeparatedList(
dbNames
)})`);
@ -63,7 +63,7 @@ export class MysqlDriver extends AbstractDriver {
colInfo.options.name = resp.COLUMN_NAME;
colInfo.options.nullable = resp.IS_NULLABLE === "YES";
colInfo.options.generated = resp.IsIdentity === 1;
colInfo.options.unique = resp.column_key === "UNI";
colInfo.options.unique = resp.COLUMN_KEY === "UNI";
colInfo.options.default = this.ReturnDefaultValueFunction(
resp.COLUMN_DEFAULT
);
@ -73,7 +73,7 @@ export class MysqlDriver extends AbstractDriver {
colInfo.tsType = "number";
break;
case "tinyint":
if (resp.column_type === "tinyint(1)") {
if (resp.COLUMN_TYPE === "tinyint(1)") {
colInfo.options.width = 1;
colInfo.tsType = "boolean";
} else {
@ -145,9 +145,10 @@ export class MysqlDriver extends AbstractDriver {
break;
case "enum":
colInfo.tsType = "string";
colInfo.options.enum = resp.column_type
.substring(5, resp.column_type.length - 1)
.replace(/\'/gi, '"');
colInfo.options.enum = resp.COLUMN_TYPE.substring(
5,
resp.COLUMN_TYPE.length - 1
).replace(/\'/gi, '"');
break;
case "json":
colInfo.tsType = "Object";