Skip to content

Commit 19ac904

Browse files
committed
Revert "TAP-5866 fix(pg):pg connector support nullsort"
This reverts commit 0b0e9ed.
1 parent 6f4a08f commit 19ac904

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed

connectors-common/postgres-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<sql.core.version>1.0-SNAPSHOT</sql.core.version>
2222
<debezium.version>1.5.4.Final</debezium.version>
2323
<postgres.core.version>1.0-SNAPSHOT</postgres.core.version>
24-
<tapdata.pdk.api.verison>1.4.5-SNAPSHOT</tapdata.pdk.api.verison>
24+
<tapdata.pdk.api.verison>1.4.4-SNAPSHOT</tapdata.pdk.api.verison>
2525

2626
</properties>
2727
<dependencyManagement>

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,31 +139,17 @@ public void buildOrderClause(StringBuilder builder, TapAdvanceFilter filter) {
139139
if (null != collate) {
140140
return getOrderByFieldClauseWithCollate(v, collate);
141141
} else {
142-
StringBuilder sb = new StringBuilder();
143-
sb.append(escapeChar).append(v.getKey()).append(escapeChar).append(" ").append(v.getSort() == ASCENDING ? "ASC" : "DESC");
144-
sb.append(buildNullSortClause(v));
145-
return sb.toString();
142+
return v.toString(String.valueOf(escapeChar));
146143
}
147144
}).collect(Collectors.joining(", "))).append(' ');
148145
}
149146
}
150147

151-
private static String buildNullSortClause(SortOn v) {
152-
if (v.getNullSort() == 1) {
153-
return ' ' + "NULLS" + ' ' + "FIRST";
154-
} else if (v.getNullSort() == 2) {
155-
return ' ' + "NULLS" + ' ' + "LAST";
156-
} else {
157-
return "";
158-
}
159-
}
160-
161148
protected String getOrderByFieldClauseWithCollate(SortOn sortOn, Collate collate) {
162149
StringBuilder sb = new StringBuilder();
163150
sb.append(escapeChar).append(sortOn.getKey()).append(escapeChar);
164151
sb.append(' ').append(buildCollate(collate.getCollateName())).append(' ');
165152
sb.append((sortOn.getSort() == ASCENDING ? "ASC" : "DESC"));
166-
sb.append(buildNullSortClause(sortOn));
167153
return sb.toString();
168154
}
169155

connectors/postgres-connector/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<java.version>8</java.version>
1818
<postgres.driver.version>42.3.4</postgres.driver.version>
19-
<tapdata.pdk.api.version>1.4.5-SNAPSHOT</tapdata.pdk.api.version>
19+
<tapdata.pdk.api.version>1.4.4-SNAPSHOT</tapdata.pdk.api.version>
2020
</properties>
2121

2222
<dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"icon": "icons/postgres.png",
55
"doc" : "${doc}",
66
"id": "postgres",
7-
"tags": ["Database", "ssl", "doubleActive", "disableForeignKey","NullsLast"]
7+
"tags": ["Database", "ssl", "doubleActive", "disableForeignKey"]
88
},
99
"configOptions": {
1010
"capabilities":[

0 commit comments

Comments
 (0)