Skip to content

Commit bd42178

Browse files
committed
oracle upper field cast
1 parent 4d57284 commit bd42178

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

oracle/oracle-side/oracle-all-side/src/main/java/com/dtstack/flink/sql/side/oracle/OracleAllSideInfo.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,21 @@ public void buildEqualInfo(JoinInfo joinInfo, SideTableInfo sideTableInfo) {
4040
sqlCondition = "select ${selectField} from ${tableName} ";
4141

4242

43-
sqlCondition = sqlCondition.replace("${tableName}", dealLowerFiled(rdbSideTableInfo.getTableName())).replace("${selectField}", dealLowerSelectFiled(sideSelectFields));
43+
sqlCondition = sqlCondition.replace("${tableName}", dealFiled(rdbSideTableInfo.getTableName())).replace("${selectField}", dealLowerSelectFiled(sideSelectFields));
4444
System.out.println("---------side_exe_sql-----\n" + sqlCondition);
4545
}
4646

4747

48-
private String dealLowerFiled(String field) {
49-
if (StringUtils.isAllUpperCase(field)) {
50-
return field;
51-
}
48+
private String dealFiled(String field) {
5249
return "\"" + field + "\"";
5350
}
5451

5552
private String dealLowerSelectFiled(String fieldsStr) {
56-
if (StringUtils.isAllUpperCase(fieldsStr)) {
57-
return fieldsStr;
58-
}
59-
6053
StringBuilder sb = new StringBuilder();
6154
String[] fields = fieldsStr.split(",");
6255

6356
for(String f : fields) {
64-
if (StringUtils.isAllUpperCase(f)) {
65-
sb.append(f).append(",");
66-
} else {
67-
sb.append("\"").append(f).append("\"").append(",");
68-
}
57+
sb.append("\"").append(f).append("\"").append(",");
6958
}
7059

7160
sb.deleteCharAt(sb.lastIndexOf(","));

oracle/oracle-side/oracle-async-side/src/main/java/com/dtstack/flink/sql/side/oracle/OracleAsyncSideInfo.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,38 +58,26 @@ public void buildEqualInfo(JoinInfo joinInfo, SideTableInfo sideTableInfo) {
5858
for (int i = 0; i < equalFieldList.size(); i++) {
5959
String equalField = equalFieldList.get(i);
6060

61-
sqlCondition += dealLowerWhereFiled(equalField) + "=? ";
61+
sqlCondition += dealLowerFiled(equalField) + "=? ";
6262
if (i != equalFieldList.size() - 1) {
6363
sqlCondition += " and ";
6464
}
6565
}
6666

67-
68-
sqlCondition = sqlCondition.replace("${tableName}", dealLowerWhereFiled(rdbSideTableInfo.getTableName())).replace("${selectField}", dealLowerSelectFiled(sideSelectFields));
67+
sqlCondition = sqlCondition.replace("${tableName}", dealLowerFiled(rdbSideTableInfo.getTableName())).replace("${selectField}", dealLowerSelectFiled(sideSelectFields));
6968
System.out.println("---------side_exe_sql-----\n" + sqlCondition);
7069
}
7170

72-
private String dealLowerWhereFiled(String field) {
73-
if (StringUtils.isAllUpperCase(field)) {
74-
return field;
75-
}
71+
private String dealLowerFiled(String field) {
7672
return "\"" + field + "\"";
7773
}
7874

7975
private String dealLowerSelectFiled(String fieldsStr) {
80-
if (StringUtils.isAllUpperCase(fieldsStr)) {
81-
return fieldsStr;
82-
}
83-
8476
StringBuilder sb = new StringBuilder();
8577
String[] fields = fieldsStr.split(",");
8678

8779
for(String f : fields) {
88-
if (StringUtils.isAllUpperCase(f)) {
89-
sb.append(f).append(",");
90-
} else {
91-
sb.append("\"").append(f).append("\"").append(",");
92-
}
80+
sb.append("\"").append(f).append("\"").append(",");
9381
}
9482

9583
sb.deleteCharAt(sb.lastIndexOf(","));

0 commit comments

Comments
 (0)