improve sqlparser