fix SQL quotes"
Remove alter statements, close #836 #837
 Merger 4.2-dev into newdev