Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hotfix] Fix filter for sqlalchemy and druid #2293

Merged
merged 2 commits into from
Feb 28, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import Select from 'react-select';
import { Button, Row, Col } from 'react-bootstrap';
import SelectControl from './SelectControl';

const arrayFilterOps = ['in', 'not in'];
const strFilterOps = ['==', '!=', '>', '<', '>=', '<=', 'regex'];

const propTypes = {
choices: PropTypes.array,
changeFilter: PropTypes.func,
Expand Down Expand Up @@ -55,6 +58,15 @@ export default class Filter extends React.Component {
if (event && event.value) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the same code is repeated twice here (55:57 and 58:60)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first event type is for input event, the second is for SelectField

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha. overall it would be more clear to have two functions, one for changeOp and one for changeValue

value = event.value;
}
if (control === 'op') {
if (arrayFilterOps.indexOf(this.props.filter.op) !== -1
&& strFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', this.props.filter.val[0]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you also need to make sure that there's length of at least one here

} else if (strFilterOps.indexOf(this.props.filter.op) !== -1
&& arrayFilterOps.indexOf(value) !== -1) {
this.props.changeFilter('val', [this.props.filter.val]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only if val is non empty non null

}
}
this.props.changeFilter(control, value);
if (control === 'col' && value !== null && this.props.datasource.filter_select) {
this.fetchFilterValues(value);
Expand All @@ -70,13 +82,13 @@ export default class Filter extends React.Component {
this.fetchFilterValues(filter.col);
}
}
if (this.props.having) {
// druid having filter
if (this.props.having || strFilterOps.indexOf(filter.op) !== -1) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like we may not need this.props.having || anymore but I may be missing something

// druid having filter or regex/==/!= filters
return (
<input
type="text"
onChange={this.changeFilter.bind(this, 'val')}
value={filter.value}
value={filter.val}
className="form-control input-sm"
placeholder="Filter value"
/>
Expand Down
23 changes: 13 additions & 10 deletions superset/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,8 @@ def visit_column(element, compiler, **kw):
col_obj = cols.get(col)
if col_obj and op in ('in', 'not in'):
values = [types.strip("'").strip('"') for types in eq]
values = [utils.js_string_to_num(s) for s in values]
if col_obj.is_num:
values = [utils.js_string_to_num(s) for s in values]
cond = col_obj.sqla_col.in_(values)
if op == 'not in':
cond = ~cond
Expand Down Expand Up @@ -2567,8 +2568,7 @@ def increment_timestamp(ts):
query=query_str,
duration=datetime.now() - qry_start_dttm)

@staticmethod
def get_filters(raw_filters):
def get_filters(self, raw_filters):
filters = None
for flt in raw_filters:
if not all(f in flt for f in ['col', 'op', 'val']):
Expand All @@ -2577,21 +2577,24 @@ def get_filters(raw_filters):
op = flt['op']
eq = flt['val']
cond = None
if op in ('in', 'not in'):
eq = [types.replace("'", '').strip() for types in eq]
if col in self.num_cols:
if op in ('in', 'not in'):
eq = [utils.js_string_to_num(v) for v in eq]
else:
eq = utils.js_string_to_num(eq)
if op == '==':
cond = Dimension(col) == eq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need to provide numbers here if comparing to a numerical column?

elif op == '!=':
cond = ~(Dimension(col) == eq)
elif op in ('in', 'not in'):
fields = []
# Distinguish quoted values with regular value types
values = [types.replace("'", '') for types in eq]
values = [utils.js_string_to_num(s) for s in values]
if len(values) > 1:
for s in values:
s = s.strip()
if len(eq) > 1:
for s in eq:
fields.append(Dimension(col) == s)
cond = Filter(type="or", fields=fields)
elif len(values) == 1:
elif len(eq) == 1:
cond = Dimension(col) == eq[0]
if op == 'not in':
cond = ~cond
Expand Down