Add support for scalar  on Database::query()