fix merge error in ExpressionFormatter of sql parser