fix grammar error
remove duplicate for sql file
fix macro definition
new version compatible for 9.3