Merge "rdbms: make Database::query() more readable and consistent"