Merge "Pass function name in Database::selectRowCount"