Explorar el Código

!69 fix bug
Merge pull request !69 from AE86/V_1.0.0_Beta

AE86 hace 2 años
padre
commit
82fc68258d

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/ConnectorFactory.java

@@ -125,7 +125,7 @@ public class ConnectorFactory implements DisposableBean {
         }
 
         Map tCmd = getConnector(tType).getTargetCommand(targetCommandConfig);
-        if (!CollectionUtils.isEmpty(sCmd)) {
+        if (!CollectionUtils.isEmpty(tCmd)) {
             map.putAll(tCmd);
         }
         return map;

+ 5 - 3
dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/sqlbuilder/SqlBuilderUpdate.java

@@ -24,13 +24,15 @@ public class SqlBuilderUpdate extends AbstractSqlBuilder {
         sql.append("UPDATE ").append(config.getSchema()).append(quotation).append(tableName).append(quotation).append(" SET ");
         for (int i = 0; i < size; i++) {
             // skip pk
-            if(fields.get(i).isPk()){
-               continue;
+            if (fields.get(i).isPk()) {
+                if (i == end) {
+                    sql.deleteCharAt(sql.length() - 1);
+                }
+                continue;
             }
 
             // "USERNAME"=?
             sql.append(quotation).append(fields.get(i).getName()).append(quotation).append("=?");
-            //如果不是最后一个字段
             if (i < end) {
                 sql.append(",");
             }

+ 16 - 7
dbsyncer-web/src/main/resources/public/plugin/plugin.html

@@ -28,6 +28,8 @@
                         <simple>新建一个类,比如MyPlugin,实现接口ConvertService方法</simple>
 <pre>package org.test;
 
+import org.dbsyncer.common.model.FullConvertContext;
+import org.dbsyncer.common.model.IncrementConvertContext;
 import org.dbsyncer.common.spi.ConvertService;
 
 import java.util.List;
@@ -38,23 +40,30 @@ public class MyPlugin implements ConvertService{
     /**
     * 全量同步
     *
-    * @param source 数据源
-    * @param target 目标源
+    * @param context
     */
     @Override
-    public void convert(List&lt;Map&gt; source, List&lt;Map&gt; target) {
+    public void convert(FullConvertContext context) {
+        // 数据源
+        List<Map> sourceList = context.getSourceList();
+        // 目标源
+        List<Map> targetList = context.getTargetList();
         // TODO 消费或处理数据
     }
 
     /**
     * 增量同步
     *
-    * @param event  事件(INSERT/UPDATE/DELETE)
-    * @param source 数据源
-    * @param target 目标源
+    * @param context
     */
     @Override
-    public void convert(String event, Map source, Map target) {
+    public void convert(IncrementConvertContext context) {
+        // 事件(INSERT/UPDATE/DELETE)
+        String event = context.getEvent();
+        // 数据源
+        Map source = context.getSource();
+        // 目标源
+        Map target = context.getTarget();
         // TODO 消费或处理数据
     }