Merge "database: Add extra sanity check to selectFieldValues()"