LPS-32110 Refactor SampleSQLBuilder, fix "test-sample-sql"