diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts index b2b8af73e5..a0efbb1555 100644 --- a/types/pg/index.d.ts +++ b/types/pg/index.d.ts @@ -53,13 +53,6 @@ export interface QueryArrayConfig extends QueryConfig { rowMode: 'array'; } -export interface QueryResult { - command: string; - rowCount: number; - oid: number; - rows: any[]; -} - export interface FieldDef { name: string; tableID: number; @@ -70,14 +63,21 @@ export interface FieldDef { format: string; } -export interface QueryArrayResult { +export interface QueryResultBase { command: string; rowCount: number; oid: number; - rows: any[][]; fields: FieldDef[]; } +export interface QueryResult extends QueryResultBase { + rows: any[]; +} + +export interface QueryArrayResult extends QueryResultBase { + rows: any[][]; +} + export interface Notification { processId: number; channel: string; diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts index 7f9fb04d69..f0defa0fb2 100644 --- a/types/pg/pg-tests.ts +++ b/types/pg/pg-tests.ts @@ -55,11 +55,13 @@ client.query(query, (err, res) => { console.error(err.stack); } else { console.log(res.rows); + console.log(res.fields.map(f => f.name)); } }); client.query(query) .then(res => { console.log(res.rows); + console.log(res.fields.map(f => f.name)); }) .catch(e => { console.error(e.stack);