46 from cubicweb.cwconfig import CubicWebNoAppConfiguration |
46 from cubicweb.cwconfig import CubicWebNoAppConfiguration |
47 from cubicweb.server import hook |
47 from cubicweb.server import hook |
48 from cubicweb.server import schema2sql as y2sql |
48 from cubicweb.server import schema2sql as y2sql |
49 from cubicweb.server.utils import crypt_password, verify_and_update |
49 from cubicweb.server.utils import crypt_password, verify_and_update |
50 from cubicweb.server.sqlutils import SQL_PREFIX, SQLAdapterMixIn |
50 from cubicweb.server.sqlutils import SQL_PREFIX, SQLAdapterMixIn |
51 from cubicweb.server.rqlannotation import set_qdata |
51 from cubicweb.server.rqlannotation import RQLAnnotator, set_qdata |
52 from cubicweb.server.hook import CleanupDeletedEidsCacheOp |
52 from cubicweb.server.hook import CleanupDeletedEidsCacheOp |
53 from cubicweb.server.edition import EditedEntity |
53 from cubicweb.server.edition import EditedEntity |
54 from cubicweb.server.sources import AbstractSource, dbg_st_search, dbg_results, rql2sql |
54 from cubicweb.server.sources import AbstractSource, dbg_st_search, dbg_results, rql2sql |
55 from cubicweb.misc.source_highlight import highlight_terminal |
55 from cubicweb.misc.source_highlight import highlight_terminal |
56 from cubicweb.statsd_logger import statsd_timeit |
56 from cubicweb.statsd_logger import statsd_timeit |
470 @statsd_timeit |
470 @statsd_timeit |
471 def compile_rql(self, rql, sols): |
471 def compile_rql(self, rql, sols): |
472 rqlst = self.repo.vreg.rqlhelper.parse(rql) |
472 rqlst = self.repo.vreg.rqlhelper.parse(rql) |
473 rqlst.restricted_vars = () |
473 rqlst.restricted_vars = () |
474 rqlst.children[0].solutions = sols |
474 rqlst.children[0].solutions = sols |
475 self.repo.querier.rqlannotator.annotate(rqlst) |
475 RQLAnnotator(self.repo.querier.schema).annotate(rqlst) |
476 set_qdata(self.schema.rschema, rqlst, ()) |
476 set_qdata(self.schema.rschema, rqlst, ()) |
477 return rqlst |
477 return rqlst |
478 |
478 |
479 def set_schema(self, schema): |
479 def set_schema(self, schema): |
480 """set the instance'schema""" |
480 """set the instance'schema""" |