Merge "refactor Database::makeSelectOptions"