jenkins-bot has submitted this change and it was merged.
Change subject: Remove QueryRevisionRepository
......................................................................
Remove QueryRevisionRepository
Change-Id: I957048ed6c30eb8db391160277bb4f764dccc3c1
---
M quarry/web/app.py
M quarry/web/models/queryrevision.py
2 files changed, 5 insertions(+), 24 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/app.py b/quarry/web/app.py
index ac99d9a..cd61505 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -1,7 +1,7 @@
from flask import Flask, render_template, redirect, session, g, request,
url_for, Response
from models.user import UserRepository, User
from models.query import Query
-from models.queryrevision import QueryRevisionRepository, QueryRevision
+from models.queryrevision import QueryRevision
from models.queryrun import QueryRunRepository, QueryRun
import json
import yaml
@@ -44,7 +44,6 @@
Session = sessionmaker(bind=g.conn.db_engine)
session = Session()
g.user_repository = UserRepository(session)
- g.query_revision_repository = QueryRevisionRepository(session)
g.query_run_repository = QueryRunRepository(session)
g.session = session
@@ -122,8 +121,7 @@
}
# Check if there's a run?
- latest_rev = g.query_revision_repository.get_latest_by_query(query)
- query_run = g.query_run_repository.get_latest_by_rev(latest_rev)
+ query_run = query.latest_rev.latest_run
if query_run is not None:
jsvars['output_url'] = url_for('api_query_output',
user_id=query.user_id, run_id=query_run.id)
@@ -132,7 +130,7 @@
user=g.user,
query=query,
jsvars=jsvars,
- latest_rev=latest_rev
+ latest_rev=query.latest_rev
)
@@ -171,7 +169,7 @@
text = request.form['text']
query = g.session.query(Query).filter(Query.id ==
request.form['query_id']).one()
- last_query_rev = g.query_revision_repository.get_latest_by_query(query)
+ last_query_rev = query.latest_rev
if last_query_rev:
last_query_run =
g.query_run_repository.get_latest_by_rev(last_query_rev)
if last_query_run:
diff --git a/quarry/web/models/queryrevision.py
b/quarry/web/models/queryrevision.py
index 344828c..80f3f8d 100644
--- a/quarry/web/models/queryrevision.py
+++ b/quarry/web/models/queryrevision.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, Unicode, ForeignKey, DateTime, desc
+from sqlalchemy import Column, Integer, Unicode, ForeignKey, DateTime
from sqlalchemy.orm import relationship
from base import Base
from query import Query # noqa
@@ -30,20 +30,3 @@
# restrict access to this from mysql
return ("Hitting information_schema", "Unauthorized access to
restricted database")
return True
-
-
-class QueryRevisionRepository:
- def __init__(self, session):
- self.session = session
-
- def save(self, query_revision):
- self.session.add(query_revision)
-
- # Persist the query revision immediately.
- self.session.commit()
-
- def get_latest_by_query(self, query):
- return self.session.query(QueryRevision) \
- .filter_by(query_id=query.id) \
- .order_by(desc(QueryRevision.timestamp)) \
- .first()
--
To view, visit https://gerrit.wikimedia.org/r/153796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I957048ed6c30eb8db391160277bb4f764dccc3c1
Gerrit-PatchSet: 2
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
