From eeb6b8682bd9ce7eb8f594862a74b2049866dc56 Mon Sep 17 00:00:00 2001 From: Grace Guo Date: Wed, 6 Sep 2017 16:55:10 -0700 Subject: [PATCH] fix encoding error in sql lab logging --- superset/sql_lab.py | 6 ++++-- superset/sql_parse.py | 2 ++ tests/sql_parse_tests.py | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/superset/sql_lab.py b/superset/sql_lab.py index 06954adaebb6a..0bfca71c81749 100644 --- a/superset/sql_lab.py +++ b/superset/sql_lab.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from time import sleep from datetime import datetime import json @@ -34,8 +36,8 @@ def dedup(l, suffix='__'): Always returns the same number of entries as provided, and always returns unique values. - >>> dedup(['foo', 'bar', 'bar', 'bar']) - ['foo', 'bar', 'bar__1', 'bar__2'] + >>> print(','.join(dedup(['foo', 'bar', 'bar', 'bar']))) + foo,bar,bar__1,bar__2 """ new_l = [] seen = {} diff --git a/superset/sql_parse.py b/superset/sql_parse.py index 0faae28b9428a..d0bf5bb9a06fc 100644 --- a/superset/sql_parse.py +++ b/superset/sql_parse.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import logging import sqlparse diff --git a/tests/sql_parse_tests.py b/tests/sql_parse_tests.py index 284e16845f61a..c9cc389309f28 100644 --- a/tests/sql_parse_tests.py +++ b/tests/sql_parse_tests.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from __future__ import absolute_import from __future__ import division from __future__ import print_function @@ -27,6 +28,10 @@ def test_simple_select(self): query = 'SELECT * FROM "tbname"' self.assertEquals({"tbname"}, self.extract_tables(query)) + # unicode encoding + query = 'SELECT * FROM "tb_name" WHERE city = "Lübeck"' + self.assertEquals({"tb_name"}, self.extract_tables(query)) + # schema self.assertEquals( {"schemaname.tbname"},