Factor out the 'key fields without link_id' logic from document
Also make sure the to-be-removed is present before removing it when
doing the field reordening.
Patch by: Sverre Rabbelier
from query import *
from subqueries import *
from where import AND, OR
from datastructures import EmptyResultSet
__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']