Lps 34727 fix hsql

Hi Matthew!

I've seen VerifyLayout (commited in LPS-34727) is breaking HSQL, and probably would break other DBMS.

Please review my code to see if everything is ok.

Thanks!