Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AA7A1200D52 for ; Fri, 17 Nov 2017 18:34:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A93CB160BE6; Fri, 17 Nov 2017 17:34:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F3C64160BFB for ; Fri, 17 Nov 2017 18:34:17 +0100 (CET) Received: (qmail 74039 invoked by uid 500); 17 Nov 2017 17:34:17 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 74030 invoked by uid 99); 17 Nov 2017 17:34:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Nov 2017 17:34:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2EFBC849E1; Fri, 17 Nov 2017 17:34:15 +0000 (UTC) Date: Fri, 17 Nov 2017 17:34:16 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] 01/02: Revert "Escape columns names for time grains - postgres (#3736)" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: maximebeauchemin@apache.org In-Reply-To: <151094005578.5792.10898623182439967827@gitbox.apache.org> References: <151094005578.5792.10898623182439967827@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/tags/0.20.6 X-Git-Reftype: tag X-Git-Rev: 4fec8c55ae11f9dc2fa0b8bc7f4c3b06f19d4075 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171117173416.2EFBC849E1@gitbox.apache.org> archived-at: Fri, 17 Nov 2017 17:34:18 -0000 This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to tag 0.20.6 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git commit 4fec8c55ae11f9dc2fa0b8bc7f4c3b06f19d4075 Author: Maxime Beauchemin AuthorDate: Tue Nov 14 21:25:41 2017 -0800 Revert "Escape columns names for time grains - postgres (#3736)" This reverts commit 814b70ffd87750c8416d0f541504d8a854e82ec1. --- superset/db_engine_specs.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py index c5363af..c9ed303 100644 --- a/superset/db_engine_specs.py +++ b/superset/db_engine_specs.py @@ -214,14 +214,14 @@ class PostgresEngineSpec(BaseEngineSpec): time_grains = ( Grain("Time Column", _('Time Column'), "{col}"), - Grain("second", _('second'), "DATE_TRUNC('second', \"{col}\")"), - Grain("minute", _('minute'), "DATE_TRUNC('minute', \"{col}\")"), - Grain("hour", _('hour'), "DATE_TRUNC('hour', \"{col}\")"), - Grain("day", _('day'), "DATE_TRUNC('day', \"{col}\")"), - Grain("week", _('week'), "DATE_TRUNC('week', \"{col}\")"), - Grain("month", _('month'), "DATE_TRUNC('month', \"{col}\")"), - Grain("quarter", _('quarter'), "DATE_TRUNC('quarter', \"{col}\")"), - Grain("year", _('year'), "DATE_TRUNC('year', \"{col}\")"), + Grain("second", _('second'), "DATE_TRUNC('second', {col})"), + Grain("minute", _('minute'), "DATE_TRUNC('minute', {col})"), + Grain("hour", _('hour'), "DATE_TRUNC('hour', {col})"), + Grain("day", _('day'), "DATE_TRUNC('day', {col})"), + Grain("week", _('week'), "DATE_TRUNC('week', {col})"), + Grain("month", _('month'), "DATE_TRUNC('month', {col})"), + Grain("quarter", _('quarter'), "DATE_TRUNC('quarter', {col})"), + Grain("year", _('year'), "DATE_TRUNC('year', {col})"), ) @classmethod -- To stop receiving notification emails like this one, please contact "commits@superset.apache.org" .