[SQLLab] user server for the query limit check. (#1230)

This commit is contained in:
Bogdan 2016-10-03 09:59:08 -07:00 committed by GitHub
parent 472679bb38
commit e11ef994bb
2 changed files with 9 additions and 3 deletions

View File

@ -193,12 +193,12 @@ class SqlEditor extends React.Component {
); );
} }
let limitWarning = null; let limitWarning = null;
const rowLimit = 1000; if (this.props.latestQuery && this.props.latestQuery.limit_reached) {
if (this.props.latestQuery && this.props.latestQuery.rows === rowLimit) {
const tooltip = ( const tooltip = (
<Tooltip id="tooltip"> <Tooltip id="tooltip">
It appears that the number of rows in the query results displayed It appears that the number of rows in the query results displayed
was limited on the server side to the {rowLimit} limit. was limited on the server side to
the {this.props.latestQuery.rows} limit.
</Tooltip> </Tooltip>
); );
limitWarning = ( limitWarning = (

View File

@ -1972,6 +1972,7 @@ class Query(Model):
# Could be configured in the caravel config. # Could be configured in the caravel config.
limit = Column(Integer) limit = Column(Integer)
limit_used = Column(Boolean, default=False) limit_used = Column(Boolean, default=False)
limit_reached = Column(Boolean, default=False)
select_as_cta = Column(Boolean) select_as_cta = Column(Boolean)
select_as_cta_used = Column(Boolean, default=False) select_as_cta_used = Column(Boolean, default=False)
@ -1994,6 +1995,10 @@ class Query(Model):
sqla.Index('ti_user_id_changed_on', user_id, changed_on), sqla.Index('ti_user_id_changed_on', user_id, changed_on),
) )
@property
def limit_reached(self):
return self.rows == self.limit if self.limit_used else False
def to_dict(self): def to_dict(self):
return { return {
'changedOn': self.changed_on, 'changedOn': self.changed_on,
@ -2016,6 +2021,7 @@ class Query(Model):
'tab': self.tab_name, 'tab': self.tab_name,
'tempTable': self.tmp_table_name, 'tempTable': self.tmp_table_name,
'userId': self.user_id, 'userId': self.user_id,
'limit_reached': self.limit_reached,
} }
@property @property