DEVIDM-131: Inject a Sql object to the query class to simplify the flow.
DEVIDM-131: Renamed the sql variable.
Merge pull request #96 from iceglow/DEVIDM-131

DEVIDM-131: Inject a Sql object to the query class to simplify the flow.