Merge pull request #2 from apache/master

updating my fork

MANIFEST.in

@@ -1,8 +1,9 @@
-recursive-include superset/templates *
+recursive-include superset/data *
+recursive-include superset/migrations *
 recursive-include superset/static *
 recursive-exclude superset/static/docs *
 recursive-exclude superset/static/spec *
 recursive-exclude superset/static/assets/node_modules *
+recursive-include superset/templates *
+recursive-include superset/translations *
 recursive-exclude tests *
-recursive-include superset/data *
-recursive-include superset/migrations *

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

superset/models/core.py

@@ -788,8 +788,8 @@ def get_perm(self):
 
     def has_table(self, table):
         engine = self.get_sqla_engine()
-        return engine.dialect.has_table(
-            engine, table.table_name, table.schema or None)
+        return engine.has_table(
+            table.table_name, table.schema or None)
 
     def get_dialect(self):
         sqla_url = url.make_url(self.sqlalchemy_uri_decrypted)