98 from rql.nodes import (VariableRef, Comparison, Relation, Constant, Variable, |
98 from rql.nodes import (VariableRef, Comparison, Relation, Constant, Variable, |
99 Not, Exists, SortTerm, Function) |
99 Not, Exists, SortTerm, Function) |
100 |
100 |
101 from cubicweb import server |
101 from cubicweb import server |
102 from cubicweb.utils import make_uid |
102 from cubicweb.utils import make_uid |
|
103 from cubicweb.rqlrewrite import add_types_restriction |
103 from cubicweb.server.utils import cleanup_solutions |
104 from cubicweb.server.utils import cleanup_solutions |
104 from cubicweb.server.ssplanner import (SSPlanner, OneFetchStep, |
105 from cubicweb.server.ssplanner import SSPlanner, OneFetchStep |
105 add_types_restriction) |
|
106 from cubicweb.server.mssteps import * |
106 from cubicweb.server.mssteps import * |
107 |
107 |
108 Variable._ms_table_key = lambda x: x.name |
108 Variable._ms_table_key = lambda x: x.name |
109 Relation._ms_table_key = lambda x: x.r_type |
109 Relation._ms_table_key = lambda x: x.r_type |
110 # str() Constant.value to ensure generated table name won't be unicode |
110 # str() Constant.value to ensure generated table name won't be unicode |