db query builder up
unit tests for db query builder up
db query builder up