Merge pull request #497 from tapdata/TAP-5866-dev

TAP-5866 fix(pg):pg connector support nullsort

Author: jarad0628

connectors-common/postgres-core/pom.xml

@@ -21,7 +21,7 @@
         <sql.core.version>1.0-SNAPSHOT</sql.core.version>
         <debezium.version>1.5.4.Final</debezium.version>
         <postgres.core.version>1.0-SNAPSHOT</postgres.core.version>
-        <tapdata.pdk.api.verison>1.4.4-SNAPSHOT</tapdata.pdk.api.verison>
+        <tapdata.pdk.api.verison>1.4.5-SNAPSHOT</tapdata.pdk.api.verison>
 
     </properties>
     <dependencyManagement>

connectors-common/postgres-core/src/main/java/io/tapdata/connector/postgres/PostgresSqlMaker.java

@@ -139,17 +139,31 @@ public void buildOrderClause(StringBuilder builder, TapAdvanceFilter filter) {
                 if (null != collate) {
                     return getOrderByFieldClauseWithCollate(v, collate);
                 } else {
-                    return v.toString(String.valueOf(escapeChar));
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(escapeChar).append(v.getKey()).append(escapeChar).append(" ").append(v.getSort() == ASCENDING ? "ASC" : "DESC");
+                    sb.append(buildNullSortClause(v));
+                    return sb.toString();
                 }
             }).collect(Collectors.joining(", "))).append(' ');
         }
     }
 
+    private static String buildNullSortClause(SortOn v) {
+        if (v.getNullSort() == 1) {
+            return ' ' + "NULLS" + ' ' + "FIRST";
+        } else if (v.getNullSort() == 2) {
+            return ' ' + "NULLS" + ' ' + "LAST";
+        } else {
+            return "";
+        }
+    }
+
     protected String getOrderByFieldClauseWithCollate(SortOn sortOn, Collate collate) {
         StringBuilder sb = new StringBuilder();
         sb.append(escapeChar).append(sortOn.getKey()).append(escapeChar);
         sb.append(' ').append(buildCollate(collate.getCollateName())).append(' ');
         sb.append((sortOn.getSort() == ASCENDING ? "ASC" : "DESC"));
+        sb.append(buildNullSortClause(sortOn));
         return sb.toString();
     }
 

connectors/postgres-connector/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <java.version>8</java.version>
         <postgres.driver.version>42.3.4</postgres.driver.version>
-        <tapdata.pdk.api.version>1.4.4-SNAPSHOT</tapdata.pdk.api.version>
+        <tapdata.pdk.api.version>1.4.5-SNAPSHOT</tapdata.pdk.api.version>
     </properties>
 
     <dependencies>

connectors/postgres-connector/src/main/resources/spec_postgres.json

@@ -4,7 +4,7 @@
     "icon": "icons/postgres.png",
     "doc" : "${doc}",
     "id": "postgres",
-    "tags": ["Database", "ssl", "doubleActive", "disableForeignKey"]
+    "tags": ["Database", "ssl", "doubleActive", "disableForeignKey","NullsLast"]
   },
   "configOptions": {
     "capabilities":[