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.

Sign up for GitHub

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

Jump to bottom

Change userId, dbId to username and dbname #1274

Merged
merged 1 commit into from
Oct 6, 2016
Merged

Change userId, dbId to username and dbname #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion caravel/assets/javascripts/SqlLab/components/QuerySearch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class QuerySearch extends React.Component {
</div>
<QueryTable
columns={[
'state', 'dbId', 'userId',
'state', 'db', 'user',
'progress', 'rows', 'sql', 'querylink',
]}
onUserClicked={this.onUserClicked.bind(this)}
Expand Down
11 changes: 6 additions & 5 deletions caravel/assets/javascripts/SqlLab/components/QueryTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class QueryTable extends React.Component {
}
getQueryLink(dbId, sql) {
const params = ['dbid=' + dbId, 'sql=' + sql, 'title=Untitled Query'];
return getLink(this.state.cleanUri, params);
const link = getLink(this.state.cleanUri, params);
return encodeURI(link);
}
hideVisualizeModal() {
this.setState({ showVisualizeModal: false });
Expand All @@ -50,20 +51,20 @@ class QueryTable extends React.Component {
if (q.endDttm) {
q.duration = fDuration(q.startDttm, q.endDttm);
}
q.userId = (
q.user = (
<button
className="btn btn-link btn-xs"
onClick={this.props.onUserClicked.bind(this, q.userId)}
>
{q.userId}
{q.user}
</button>
);
q.dbId = (
q.db = (
<button
className="btn btn-link btn-xs"
onClick={this.props.onDbClicked.bind(this, q.dbId)}
>
{q.dbId}
{q.db}
</button>
);
q.started = moment(q.startDttm).format('HH:mm:ss');
Expand Down
3 changes: 3 additions & 0 deletions caravel/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,6 +2006,7 @@ class Query(Model):

database = relationship(
'Database', foreign_keys=[database_id], backref='queries')
user = relationship('User', backref='queries', foreign_keys=[user_id])

__table_args__ = (
sqla.Index('ti_user_id_changed_on', user_id, changed_on),
Expand All @@ -2020,6 +2021,7 @@ def to_dict(self):
'changedOn': self.changed_on,
'changed_on': self.changed_on.isoformat(),
'dbId': self.database_id,
'db': self.database.database_name,
'endDttm': self.end_time,
'errorMessage': self.error_message,
'executedSql': self.executed_sql,
Expand All @@ -2037,6 +2039,7 @@ def to_dict(self):
'tab': self.tab_name,
'tempTable': self.tmp_table_name,
'userId': self.user_id,
'user': self.user.username,
'limit_reached': self.limit_reached,
}

Expand Down