latest code, dia and sql model
Revert "latest code, dia and sql model"

This reverts commit 4f9a92aca052f1ebfc08c3d4b652a0c9254d1d08.