equal
deleted
inserted
replaced
634 for source, solindex in sources: |
634 for source, solindex in sources: |
635 try: |
635 try: |
636 sourcesterms[source][term].remove(solindex) |
636 sourcesterms[source][term].remove(solindex) |
637 except KeyError: |
637 except KeyError: |
638 import rql.base as rqlb |
638 import rql.base as rqlb |
639 assert isinstance(term, rqlb.BaseNode), repr(term) |
639 assert isinstance(term, (rqlb.BaseNode, Variable)), repr(term) |
640 continue # may occur with subquery column alias |
640 continue # may occur with subquery column alias |
641 if not sourcesterms[source][term]: |
641 if not sourcesterms[source][term]: |
642 del sourcesterms[source][term] |
642 del sourcesterms[source][term] |
643 if not sourcesterms[source]: |
643 if not sourcesterms[source]: |
644 del sourcesterms[source] |
644 del sourcesterms[source] |