From ce78c378742a561c128b075da87e969f998dd388 Mon Sep 17 00:00:00 2001 From: Matt Hilliard Date: Tue, 11 Aug 2020 16:20:43 -0600 Subject: [PATCH] Makes Postgres driver aware of new identity columns --- src/drivers/PostgresDriver.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts index 6ac3d1b..f6fd8fc 100644 --- a/src/drivers/PostgresDriver.ts +++ b/src/drivers/PostgresDriver.ts @@ -73,7 +73,8 @@ export default class PostgresDriver extends AbstractDriver { character_maximum_length: number; numeric_precision: number; numeric_scale: number; - isidentity: string; + isidentity: string; // SERIAL identity type + is_identity: string; // reccommended INDENTITY type for pg > 10 isunique: string; enumvalues: string | null; /* eslint-enable camelcase */ @@ -82,6 +83,7 @@ export default class PostgresDriver extends AbstractDriver { .query(`SELECT table_name,column_name,udt_name,column_default,is_nullable, data_type,character_maximum_length,numeric_precision,numeric_scale, case when column_default LIKE 'nextval%' then 'YES' else 'NO' end isidentity, + is_identity, (SELECT count(*) FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc inner join INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE cu @@ -114,7 +116,7 @@ export default class PostgresDriver extends AbstractDriver { if (resp.isunique === "1") options.unique = true; const generated = - resp.isidentity === "YES" ? true : undefined; + resp.isidentity === "YES" || resp.is_identity === "YES" ? true : undefined; const defaultValue = generated ? undefined : PostgresDriver.ReturnDefaultValueFunction(