From e84a1cbcc5f82892e73cf53b7e2221dca7b22b98 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Thu, 16 Aug 2018 12:50:32 +0200 Subject: [PATCH] persist datatype information --- public/app/core/components/sql_part/sql_part.ts | 3 +++ public/app/plugins/datasource/postgres/query_ctrl.ts | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/sql_part/sql_part.ts b/public/app/core/components/sql_part/sql_part.ts index 5fc6072fc8c..a9b76b1ed2d 100644 --- a/public/app/core/components/sql_part/sql_part.ts +++ b/public/app/core/components/sql_part/sql_part.ts @@ -38,6 +38,7 @@ export class SqlPart { params: any[]; label: string; name: string; + datatype: string; constructor(part: any, def: any) { this.part = part; @@ -46,6 +47,8 @@ export class SqlPart { throw { message: 'Could not find sql part ' + part.type }; } + this.datatype = part.datatype; + if (part.name) { this.name = part.name; this.label = def.label + ' ' + part.name; diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts index be2ec175b26..069dcca2fcf 100644 --- a/public/app/plugins/datasource/postgres/query_ctrl.ts +++ b/public/app/plugins/datasource/postgres/query_ctrl.ts @@ -87,14 +87,14 @@ export class PostgresQueryCtrl extends QueryCtrl { updatePersistedParts() { this.target.select = _.map(this.selectParts, function(selectParts) { return _.map(selectParts, function(part: any) { - return { type: part.def.type, params: part.params }; + return { type: part.def.type, datatype: part.datatype, params: part.params }; }); }); this.target.where = _.map(this.whereParts, function(part: any) { - return { type: part.def.type, name: part.name, params: part.params }; + return { type: part.def.type, datatype: part.datatype, name: part.name, params: part.params }; }); this.target.group = _.map(this.groupParts, function(part: any) { - return { type: part.def.type, params: part.params }; + return { type: part.def.type, datatype: part.datatype, params: part.params }; }); }