handle queryByPrimary() with query() and remove queryOne()