Fix clippy collapsible-if warnings #2368

Job	Run time
docker_build (linux/amd64, duckdb)	9m 33s
windows_test	3m 37s
compile_and_lint	2m 45s
docker_build (linux/amd64, minimal)	5m 48s
test (mssql, mssql, mssql://root:Password123!@127.0.0.1/sqlpage)	2m 22s
test (odbc, postgres, Driver=PostgreSQL Unicode;Server=127.0.0.1;Port=5432;Database=sqlpage;UID=r...	2m 35s
docker_build (linux/arm64, minimal)	6m 43s
docker_build (linux/arm/v7, minimal)	5m 46s
docker_build (linux/arm64, duckdb)	6m 40s
test (postgres, postgres, postgres://root:Password123!@127.0.0.1/sqlpage)	2m 22s
test (oracle, oracle, Driver=Oracle 21 ODBC driver;Dbq=//127.0.0.1:1521/FREEPDB1;Uid=root;Pwd=Pas...	3m 12s
test (mysql, mysql, mysql://root:Password123!@127.0.0.1/sqlpage)	1m 55s
docker_push (minimal)	23s
docker_push (duckdb)	14s
	53m 55s

Provide feedback