!213 oracle字段兼容，ddl开关

Merge pull request !213 from life/v_2.0

dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -181,10 +181,12 @@ public class MappingChecker extends AbstractChecker {
         String banUpdate = StringUtil.isNotBlank(params.get("banUpdate")) ? "true" : "false";
         String banInsert = StringUtil.isNotBlank(params.get("banInsert")) ? "true" : "false";
         String banDelete = StringUtil.isNotBlank(params.get("banDelete")) ? "true" : "false";
+        String banDDL = StringUtil.isNotBlank(params.get("banDDL")) ? "true" : "false";
 
         listener.setBanUpdate(BooleanUtil.toBoolean(banUpdate));
         listener.setBanInsert(BooleanUtil.toBoolean(banInsert));
         listener.setBanDelete(BooleanUtil.toBoolean(banDelete));
+        listener.setBanDDL(BooleanUtil.toBoolean(banDDL));
     }
 
     /**

dbsyncer-connector/dbsyncer-connector-oracle/src/main/java/org/dbsyncer/connector/oracle/logminer/parser/AbstractParser.java

@@ -10,8 +10,6 @@ import net.sf.jsqlparser.schema.Column;
 import oracle.jdbc.OracleTypes;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.sdk.model.Field;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.sql.Types;
 import java.util.HashMap;
@@ -26,7 +24,6 @@ import java.util.Map;
  */
 public abstract class AbstractParser implements Parser {
 
-    private final Logger logger = LoggerFactory.getLogger(getClass());
     protected Map<String, Expression> columnMap = new HashMap<>();
     protected List<Field> fields;
 
@@ -54,11 +51,15 @@ public abstract class AbstractParser implements Parser {
         List<Object> data = new LinkedList<>();
         //需要进行数据库类型
         for (Field field : fields) {
-            OracleColumnValue oracleColumnValue = new OracleColumnValue(
-                    columnMap.get(field.getName()));
+            OracleColumnValue oracleColumnValue = new OracleColumnValue(columnMap.get(field.getName()));
+            // 无效空值
+            if (oracleColumnValue.isNull()){
+                data.add(null);
+                continue;
+            }
             switch (field.getType()) {
                 case Types.NUMERIC:
-                    data.add(convertNumber(oracleColumnValue,field));
+                    data.add(convertNumber(oracleColumnValue, field));
                     break;
                 case Types.DECIMAL:
                     data.add(oracleColumnValue.asBigDecimal());
@@ -69,7 +70,7 @@ public abstract class AbstractParser implements Parser {
                     break;
                 //timezone
                 case OracleTypes.TIMESTAMPTZ:
-                    data.add(oracleColumnValue.asTimestamp());
+                    data.add(oracleColumnValue.asOffsetDateTime());
                     break;
                 default:
                     data.add(oracleColumnValue.asString());
@@ -78,25 +79,23 @@ public abstract class AbstractParser implements Parser {
         return data;
     }
 
-    private Object convertNumber(OracleColumnValue oracleColumnValue,Field field) {
-        if (field.getRatio() <=0){
-            int result =field.getColumnSize() - field.getRatio();
-            if ( result <10){
+    private Object convertNumber(OracleColumnValue oracleColumnValue, Field field) {
+        if (field.getRatio() <= 0) {
+            int result = field.getColumnSize() - field.getRatio();
+            if (result < 10) {
                 return oracleColumnValue.asInteger();
             }
-            if (result <19){
+            if (result < 19) {
                 return oracleColumnValue.asBigInteger();
             }
-            if (result <39){
+            if (result < 39) {
                 return oracleColumnValue.asBigDecimal();
             }
             return oracleColumnValue.asString();
-        }else{
-            return oracleColumnValue.asBigDecimal();
         }
+        return oracleColumnValue.asBigDecimal();
     }
 
-
     public void setFields(List<Field> fields) {
         this.fields = fields;
     }

dbsyncer-connector/dbsyncer-connector-oracle/src/main/java/org/dbsyncer/connector/oracle/logminer/parser/OracleColumnValue.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2024 All Rights Reserved.
+ */
 package org.dbsyncer.connector.oracle.logminer.parser;
 
 import net.sf.jsqlparser.expression.Expression;
@@ -18,28 +21,42 @@ import java.math.BigInteger;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * Oracle 字段值解析
+ *
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2024-01-09 23:02
+ */
 public class OracleColumnValue extends AbstractColumnValue<Expression> {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-
     public OracleColumnValue(Expression value) {
         setValue(value);
     }
 
-
     @Override
-    public String asString() {
-        if (getValue() instanceof NullValue){
-            return null;
+    public boolean isNull() {
+        if (getValue() instanceof IsNullExpression) {
+            return true;
         }
-        if (getValue() instanceof StringValue){
-            return StringUtil.replace(((StringValue) getValue()).getValue(),StringUtil.DOUBLE_QUOTATION,StringUtil.EMPTY);
+        if (getValue() instanceof NullValue) {
+            return true;
         }
-        return getValue().toString();
+        if (getValue() instanceof IsNullExpression) {
+            return true;
+        }
+        return super.isNull();
+    }
+
+    @Override
+    public String asString() {
+        return Objects.toString(getValue());
     }
 
     @Override
@@ -54,10 +71,7 @@ public class OracleColumnValue extends AbstractColumnValue<Expression> {
 
     @Override
     public Integer asInteger() {
-        if (asString() == null){
-            return null;
-        }
-       return Integer.valueOf(asString());
+        return Integer.valueOf(asString());
     }
 
     @Override
@@ -82,9 +96,6 @@ public class OracleColumnValue extends AbstractColumnValue<Expression> {
 
     @Override
     public BigDecimal asBigDecimal() {
-        if (asString() == null){
-            return null;
-        }
         return new BigDecimal(asString());
     }
 
@@ -95,15 +106,43 @@ public class OracleColumnValue extends AbstractColumnValue<Expression> {
 
     @Override
     public Timestamp asTimestamp() {
-        if (getValue() instanceof IsNullExpression){
-            return null;
-        }
-        if (getValue() instanceof NullValue){
-            return null;
-        }
-        Function function = (Function) getValue();
-        List<String> multipartName = function.getMultipartName();
-        ExpressionList parameters = function.getParameters();
+        return handleColumnValue((type, value) -> {
+            switch (type) {
+                case "TO_DATE":
+                    return toDate(value);
+                case "TO_TIMESTAMP":
+                    return toTimestamp(value);
+                default:
+                    return null;
+            }
+        });
+    }
+
+    @Override
+    public Time asTime() {
+        return null;
+    }
+
+    @Override
+    public BigInteger asBigInteger() {
+        return new BigInteger(asString());
+    }
+
+    public OffsetDateTime asOffsetDateTime() {
+        return handleColumnValue((type, value) -> {
+            switch (type) {
+                case "TO_TIMESTAMP_TZ":
+                    return toOffsetDateTime(value);
+                default:
+                    return null;
+            }
+        });
+    }
+
+    private <R> R handleColumnValue(ColumnValueFunction<R> function) {
+        Function fun = (Function) getValue();
+        List<String> multipartName = fun.getMultipartName();
+        ExpressionList parameters = fun.getParameters();
         if (CollectionUtils.isEmpty(multipartName) || CollectionUtils.isEmpty(parameters)) {
             return null;
         }
@@ -120,39 +159,13 @@ public class OracleColumnValue extends AbstractColumnValue<Expression> {
         }
 
         try {
-            switch (nameType) {
-                case "TO_DATE":
-                    return toDate(value);
-                case "TO_TIMESTAMP":
-                    return toTimestamp(value);
-
-            }
+            return function.apply(nameType, value);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
         }
         return null;
     }
 
-    @Override
-    public Time asTime() {
-        return null;
-    }
-
-    @Override
-    public BigInteger asBigInteger() {
-        if (getValue() instanceof IsNullExpression){
-            return null;
-        }
-        if (getValue() instanceof NullValue){
-            return null;
-        }
-        Object ob = asString();
-        if (ob == null){
-            return null;
-        }
-        return new BigInteger(ob.toString());
-    }
-
     private Timestamp toDate(Object value) {
         return DateFormatUtil.stringToTimestamp(Objects.toString(value));
     }
@@ -161,4 +174,13 @@ public class OracleColumnValue extends AbstractColumnValue<Expression> {
         return DateFormatUtil.stringToTimestamp(StringUtil.replace(Objects.toString(value), StringUtil.POINT, StringUtil.EMPTY));
     }
 
+    private OffsetDateTime toOffsetDateTime(Object value) {
+        return DateFormatUtil.timestampWithTimeZoneToOffsetDateTime(Objects.toString(value));
+    }
+
+    interface ColumnValueFunction<R> {
+
+        R apply(String type, Object value);
+
+    }
 }

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/config/ListenerConfig.java

@@ -55,6 +55,11 @@ public class ListenerConfig {
      */
     private boolean banDelete;
 
+    /**
+     * 禁用ddl事件
+     */
+    private boolean banDDL;
+
     public ListenerConfig() {
     }
 
@@ -133,4 +138,12 @@ public class ListenerConfig {
     public void setBanDelete(boolean banDelete) {
         this.banDelete = banDelete;
     }
+
+    public boolean isBanDDL() {
+        return banDDL;
+    }
+
+    public void setBanDDL(boolean banDDL) {
+        this.banDDL = banDDL;
+    }
 }

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/AbstractDatabaseConnector.java

@@ -128,7 +128,7 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
                 String typeName = columnMetadata.getString(6);
                 int columnSize = columnMetadata.getInt(7);
                 int ratio = columnMetadata.getInt(9);
-                fields.add(new Field(columnName, typeName, columnType, primaryKeys.contains(columnName),columnSize,ratio));
+                fields.add(new Field(columnName, typeName, columnType, primaryKeys.contains(columnName), columnSize, ratio));
             }
             return fields;
         });

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/AbstractListener.java

@@ -65,7 +65,7 @@ public abstract class AbstractListener<C extends ConnectorInstance> implements L
                     break;
                 case ConnectorConstant.OPERTION_ALTER:
                     // 表结构变更事件
-                    watcher.changeEvent(event);
+                    processEvent(!listenerConfig.isBanDDL(),event);
                     break;
                 default:
                     break;

dbsyncer-web/src/main/resources/public/mapping/editIncrement.html

@@ -49,24 +49,30 @@
     <!-- 增量事件配置 -->
     <div class="form-group">
         <div class="row">
-            <div class="col-md-4">
+            <div class="col-md-3">
                 <label class="col-sm-3 control-label text-right">新增*</label>
                 <div class="col-sm-9">
                     <input name="banInsert" class="banEventSwitch" th:checked="${mapping?.listener?.banInsert}" type="checkbox">
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-3">
                 <label class="col-sm-3 control-label text-right">修改*</label>
                 <div class="col-sm-9">
                     <input name="banUpdate" class="banEventSwitch" th:checked="${mapping?.listener?.banUpdate}" type="checkbox">
                 </div>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-3">
                 <label class="col-sm-3 control-label text-right">删除*</label>
                 <div class="col-sm-9">
                     <input name="banDelete" class="banEventSwitch" th:checked="${mapping?.listener?.banDelete}" type="checkbox">
                 </div>
             </div>
+            <div class="col-md-3">
+                <label class="col-sm-3 control-label text-right">ddl*</label>
+                <div class="col-sm-9">
+                    <input name="banDDL" class="banEventSwitch" th:checked="${mapping?.listener?.banDDL}" type="checkbox">
+                </div>
+            </div>
         </div>
     </div>