fix for 350676860a7efbd6e456bd1084faea2d6221cb1c, update ddl and testdata sql