db: move return_values to use raw SQL