(PDB-708) Make storage changes compatible with hsqldb

Signed-off-by: Ken Barber <ken@bob.sh>