refactor: tweaks after #3791 #1585

Job	Run time
Check	1m 0s
Integration Test (macOS-13)	1m 49s
Integration Test (ubuntu-latest)	46s
Build (windows-latest)	3m 24s
Integration Test (macOS-latest)	1m 30s
Build (ubuntu-latest)	57s
Functional Test (MySQL)	59s
Build (macOS-13)	1m 26s
Functional Test (SQLite)	42s
Functional Test (PostgreSQL)	51s
Build (macOS-latest)	1m 9s
	14m 33s

Provide feedback