The Teiid project has an embeddable relational query engine that is far more capable than ModeShape's. We should try to replace ours with the Teiid engine.

(This was the long-term goal from the very beginning of ModeShape, but at the time Teiid's engine was not a separate, embeddable component. There is such a thing now.)