From 0ac6994e2245e94a3dac8aed5974e32f0560bac9 Mon Sep 17 00:00:00 2001 From: FUNKYE <364176773@qq.com> Date: Fri, 11 Jun 2021 00:26:43 +0800 Subject: [PATCH] update --- .../dialect/oracle/visitor/OracleOutputVisitor.java | 13 +++++++------ .../dialect/postgresql/visitor/PGOutputVisitor.java | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 8844a74bb3..277ec4d221 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -38,6 +38,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectRestriction.Rea import com.alibaba.druid.sql.dialect.oracle.parser.OracleFunctionDataType; import com.alibaba.druid.sql.dialect.oracle.parser.OracleProcedureDataType; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; +import org.eclipse.jetty.util.StringUtil; import java.util.List; import java.util.Optional; @@ -776,19 +777,19 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS @Override public boolean visit(OracleBinaryFloatExpr x) { - Optional.ofNullable(x.getValue()).ifPresent(value -> { - print0(value.toString()); + if (x != null && x.getValue() != null) { + print0(x.getValue().toString()); print('F'); - }); + } return false; } @Override public boolean visit(OracleBinaryDoubleExpr x) { - Optional.ofNullable(x.getValue()).ifPresent(value -> { - print0(value.toString()); + if (x != null && x.getValue() != null) { + print0(x.getValue().toString()); print('D'); - }); + } return false; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index c628448510..d64fbc9508 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -33,6 +33,7 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.Fetc import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock.ForClause; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.FnvHash; +import org.eclipse.jetty.util.StringUtil; import java.util.LinkedHashSet; import java.util.List; @@ -958,18 +959,18 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor } public boolean visit(OracleBinaryFloatExpr x) { - Optional.ofNullable(x.getValue()).ifPresent(value -> { - print0(value.toString()); + if (x != null && x.getValue() != null) { + print0(x.getValue().toString()); print('F'); - }); + } return false; } public boolean visit(OracleBinaryDoubleExpr x) { - Optional.ofNullable(x.getValue()).ifPresent(value -> { - print0(value.toString()); + if (x != null && x.getValue() != null) { + print0(x.getValue().toString()); print('D'); - }); + } return false; }