fixed invalid function date_trunc when connecting to hive -- issue#7270

CONTRIBUTING.md

@@ -319,7 +319,7 @@ pip install -r requirements-dev.txt
 pip install -e .
 
 # Create an admin user in your metadata database
-fabmanager create-admin --app superset
+flask fab create-admin --app superset
 
 # Initialize the database
 superset db upgrade
@@ -594,7 +594,7 @@ LANGUAGES = {
 ### Extracting new strings for translation
 
 ```bash
-fabmanager babel-extract --target superset/translations --output superset/translations/messages.pot --config superset/translations/babel.cfg -k _ -k __ -k t -k tn -k tct
+flask fab babel-extract --target superset/translations --output superset/translations/messages.pot --config superset/translations/babel.cfg -k _ -k __ -k t -k tn -k tct
 ```
 
 You can then translate the strings gathered in files located under
@@ -607,7 +607,7 @@ For the translations to take effect:
 ```bash
 # In the case of JS translation, we need to convert the PO file into a JSON file, and we need the global download of the npm package po2json.
 npm install -g po2json
-fabmanager babel-compile --target superset/translations
+flask fab babel-compile --target superset/translations
 # Convert the en PO file into a JSON file
 po2json -d superset -f jed1.x superset/translations/en/LC_MESSAGES/messages.po superset/translations/en/LC_MESSAGES/messages.json
 ```

contrib/docker/docker-init.sh

@@ -18,7 +18,7 @@
 set -ex
 
 # Create an admin user (you will be prompted to set username, first and last name before setting a password)
-fabmanager create-admin --app superset
+flask fab create-admin --app superset
 
 # Initialize the database
 superset db upgrade

superset/assets/spec/javascripts/components/OnPasteSelect_spec.jsx

@@ -74,15 +74,47 @@ describe('OnPasteSelect', () => {
   });
 
   describe('onPaste', () => {
-    it('calls onChange with pasted values', () => {
+    it('calls onChange with pasted comma separated values', () => {
       wrapper.instance().onPaste(evt);
       expected = props.options.slice(0, 4);
       expect(props.onChange.calledWith(expected)).toBe(true);
       expect(evt.preventDefault.called).toBe(true);
       expect(props.isValidNewOption.callCount).toBe(5);
     });
 
-    it('calls onChange without any duplicate values and adds new values', () => {
+    it('calls onChange with pasted new line separated values', () => {
+      evt.clipboardData.getData = sinon.spy(() =>
+        'United States\nChina\nRussian Federation\nIndia',
+      );
+      wrapper.instance().onPaste(evt);
+      expected = [
+        props.options[0],
+        props.options[1],
+        props.options[4],
+        props.options[2],
+      ];
+      expect(props.onChange.calledWith(expected)).toBe(true);
+      expect(evt.preventDefault.called).toBe(true);
+      expect(props.isValidNewOption.callCount).toBe(9);
+    });
+
+    it('calls onChange with pasted tab separated values', () => {
+      evt.clipboardData.getData = sinon.spy(() =>
+        'Russian Federation\tMexico\tIndia\tCanada',
+      );
+      wrapper.instance().onPaste(evt);
+      expected = [
+        props.options[4],
+        props.options[6],
+        props.options[2],
+        props.options[3],
+      ];
+      expect(props.onChange.calledWith(expected)).toBe(true);
+      expect(evt.preventDefault.called).toBe(true);
+      expect(props.isValidNewOption.callCount).toBe(13);
+    });
+
+    it('calls onChange without duplicate values and adds new comma separated values', () => {
       evt.clipboardData.getData = sinon.spy(() =>
         'China, China, China, China, Mexico, Mexico, Chi na, Mexico, ',
       );
@@ -94,12 +126,43 @@ describe('OnPasteSelect', () => {
       wrapper.instance().onPaste(evt);
       expect(props.onChange.calledWith(expected)).toBe(true);
       expect(evt.preventDefault.called).toBe(true);
-      expect(props.isValidNewOption.callCount).toBe(9);
+      expect(props.isValidNewOption.callCount).toBe(17);
       expect(props.options[0].value).toBe(expected[2].value);
       props.options.splice(0, 1);
     });
 
-    it('calls onChange with currently selected values and new values', () => {
+    it('calls onChange without duplicate values and parses new line separated values', () => {
+      evt.clipboardData.getData = sinon.spy(() =>
+        'United States\nCanada\nMexico\nUnited States\nCanada',
+      );
+      expected = [
+        props.options[0],
+        props.options[3],
+        props.options[6],
+      ];
+      wrapper.instance().onPaste(evt);
+      expect(props.onChange.calledWith(expected)).toBe(true);
+      expect(evt.preventDefault.called).toBe(true);
+      expect(props.isValidNewOption.callCount).toBe(20);
+    });
+
+    it('calls onChange without duplicate values and parses tab separated values', () => {
+        evt.clipboardData.getData = sinon.spy(() =>
+          'China\tIndia\tChina\tRussian Federation\tJapan\tJapan',
+        );
+        expected = [
+          props.options[1],
+          props.options[2],
+          props.options[4],
+          props.options[5],
+        ];
+        wrapper.instance().onPaste(evt);
+        expect(props.onChange.calledWith(expected)).toBe(true);
+        expect(evt.preventDefault.called).toBe(true);
+        expect(props.isValidNewOption.callCount).toBe(24);
+      });
+
+    it('calls onChange with currently selected values and new comma separated values', () => {
       props.value = ['United States', 'Canada', 'Mexico'];
       evt.clipboardData.getData = sinon.spy(() =>
         'United States, Canada, Japan, India',
@@ -115,7 +178,45 @@ describe('OnPasteSelect', () => {
       wrapper.instance().onPaste(evt);
       expect(props.onChange.calledWith(expected)).toBe(true);
       expect(evt.preventDefault.called).toBe(true);
-      expect(props.isValidNewOption.callCount).toBe(11);
+      expect(props.isValidNewOption.callCount).toBe(26);
     });
+
+    it('calls onChange with currently selected values and new "new line" separated values', () => {
+      props.value = ['China', 'India', 'Japan'];
+      evt.clipboardData.getData = sinon.spy(() =>
+        'Mexico\nJapan\nIndia',
+      );
+      wrapper = shallow(<OnPasteSelect {...props} />);
+      expected = [
+        props.options[1],
+        props.options[2],
+        props.options[5],
+        props.options[6],
+      ];
+      wrapper.instance().onPaste(evt);
+      expect(props.onChange.calledWith(expected)).toBe(true);
+      expect(evt.preventDefault.called).toBe(true);
+      expect(props.isValidNewOption.callCount).toBe(27);
+    });
+
+    it('calls onChange with currently selected values and new tab separated values', () => {
+        props.value = ['United States', 'Canada', 'Mexico', 'Russian Federation'];
+        evt.clipboardData.getData = sinon.spy(() =>
+          'United States\tCanada\tJapan\tIndia',
+        );
+        wrapper = shallow(<OnPasteSelect {...props} />);
+        expected = [
+          props.options[0],
+          props.options[3],
+          props.options[6],
+          props.options[4],
+          props.options[5],
+          props.options[2],
+        ];
+        wrapper.instance().onPaste(evt);
+        expect(props.onChange.calledWith(expected)).toBe(true);
+        expect(evt.preventDefault.called).toBe(true);
+        expect(props.isValidNewOption.callCount).toBe(29);
+      });
   });
 });

superset/assets/src/components/OnPasteSelect.jsx

@@ -84,7 +84,7 @@ export default class OnPasteSelect extends React.Component {
 }
 
 OnPasteSelect.propTypes = {
-  separator: PropTypes.string.isRequired,
+  separator: PropTypes.array.isRequired,
   selectWrap: PropTypes.func.isRequired,
   refFunc: PropTypes.func,
   onChange: PropTypes.func.isRequired,
@@ -96,7 +96,7 @@ OnPasteSelect.propTypes = {
   isValidNewOption: PropTypes.func,
 };
 OnPasteSelect.defaultProps = {
-  separator: ',',
+  separator: [',', '\n', '\t'],
   selectWrap: Select,
   valueKey: 'value',
   labelKey: 'label',

superset/db_engine_specs.py

@@ -1812,10 +1812,23 @@ def latest_sub_partition(cls, table_name, schema, database, **kwargs):
 
 class HiveEngineSpec(PrestoEngineSpec):
 
-    """Reuses PrestoEngineSpec functionality."""
+    """Based on PrestoEngineSpec but using hive date functions instead"""
 
     engine = 'hive'
     max_column_name_length = 767
+    time_grain_functions = {
+        None: '{col}',
+        'PT1S': "from_unixtime(unix_timestamp({col}), 'yyyy-MM-dd HH:mm:ss')",
+        'PT1M': "from_unixtime(unix_timestamp({col}), 'yyyy-MM-dd HH:mm:00')",
+        'PT1H': "from_unixtime(unix_timestamp({col}), 'yyyy-MM-dd HH:00:00')",
+        'P1D': "from_unixtime(unix_timestamp({col}), 'yyyy-MM-dd 00:00:00')",
+        'P1W': "next_day(date_add({col}, -7),'Monday')",
+        'P1M': "trunc({col}, 'MM')",
+        'P0.25Y': "add_months(trunc({col}, 'MM'), -(month({col})-1)%3)",
+        'P1Y': "from_unixtime(unix_timestamp({col}), 'yyyy-01-01 00:00:00')",
+        'P1W/1970-01-03T00:00:00Z': "next_day({col}, 'Saturday')",
+        '1969-12-28T00:00:00Z/P1W': "next_day(date_add({col}, -7),'Sunday')",
+    }
 
     # Scoping regex at class level to avoid recompiling
     # 17/02/07 19:36:38 INFO ql.Driver: Total jobs = 5

superset/views/core.py

@@ -546,6 +546,12 @@ class SliceModelView(SupersetModelView, DeleteMixin):  # noqa
         'viz_type': _('Visualization Type'),
     }
 
+    add_form_query_rel_fields = {
+        'dashboards': [['name', DashboardFilter, None]],
+    }
+
+    edit_form_query_rel_fields = add_form_query_rel_fields
+
     def pre_add(self, obj):
         utils.validate_json(obj.params)