Skip to content

bugfix: mysql insert on update duplicate sensitive case not matched #4912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 6, 2022
Merged

bugfix: mysql insert on update duplicate sensitive case not matched #4912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5810b9a
bugfix: mysql insert or update column case is different and cannot be…
funky-eyes Sep 6, 2022
bdb6ee6
update
funky-eyes Sep 6, 2022
eb99c80
update
funky-eyes Sep 6, 2022
f9f9550
Merge branch 'develop' into 0906
funky-eyes Sep 6, 2022
4101bc8
update
funky-eyes Sep 6, 2022
6de7b0f
Merge branch '0906' of github.com:a364176773/seata into 0906
funky-eyes Sep 6, 2022
87554b6
update
funky-eyes Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/main/java/io/seata/common/util/LowerCaseLinkHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
*/
package io.seata.common.util;

import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.Collection;
import java.util.Objects;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Collectors;

public class LowerCaseLinkHashMap<V> implements Map<String, V> {

Expand Down Expand Up @@ -110,7 +110,7 @@ public void clear() {

@Override
public Set<String> keySet() {
return lowerKeyToOriginMap.values().stream().collect(Collectors.toSet());
return new HashSet<>(lowerKeyToOriginMap.values());
}

@Override
Expand Down
18 changes: 9 additions & 9 deletions ...tasource/src/main/java/io/seata/rm/datasource/exec/mysql/MySQLInsertOrUpdateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ public TableRecords beforeImage() throws SQLException {
*/
public TableRecords buildTableRecords2(TableMeta tableMeta, String selectSQL, ArrayList<List<Object>> paramAppenderList, List<Object> primaryKeys) throws SQLException {
ResultSet rs = null;
try (PreparedStatement ps = statementProxy.getConnection().prepareStatement(selectSQL + " FOR UPDATE")) {
try (PreparedStatement ps = statementProxy.getConnection()
.prepareStatement(primaryKeys.isEmpty() ? selectSQL + " FOR UPDATE" : selectSQL)) {
int ts = CollectionUtils.isEmpty(paramAppenderList) ? 0 : paramAppenderList.size();
int ds = ts == 0 ? 0 : paramAppenderList.get(0).size();
for (int i = 0; i < ts; i++) {
Expand Down Expand Up @@ -300,12 +301,13 @@ public String buildImageSQL(TableMeta tableMeta) {
List<String> uniqueList = new ArrayList<>();
for (ColumnMeta m : v.getValues()) {
String columnName = m.getColumnName();
if (imageParameterMap.get(columnName) == null && m.getColumnDef() != null) {
List<Object> imageParameters = imageParameterMap.get(columnName);
if (imageParameters == null && m.getColumnDef() != null) {
uniqueList.add(columnName + " = DEFAULT(" + columnName + ") ");
columnIsNull = false;
continue;
}
if ((imageParameterMap.get(columnName) == null && m.getColumnDef() == null) || imageParameterMap.get(columnName).get(finalI) == null || imageParameterMap.get(columnName).get(finalI) instanceof Null) {
if ((imageParameters == null && m.getColumnDef() == null) || imageParameters.get(finalI) == null || imageParameters.get(finalI) instanceof Null) {
if (!"PRIMARY".equalsIgnoreCase(k)) {
columnIsNull = false;
uniqueList.add(columnName + " is ? ");
Expand All @@ -316,7 +318,7 @@ public String buildImageSQL(TableMeta tableMeta) {
}
columnIsNull = false;
uniqueList.add(columnName + " = ? ");
paramAppenderTempList.add(imageParameterMap.get(columnName).get(finalI));
paramAppenderTempList.add(imageParameters.get(finalI));
}
if (!columnIsNull) {
if (isContainWhere[0]) {
Expand Down Expand Up @@ -365,22 +367,20 @@ public Map<String, ArrayList<Object>> buildImageParameters(SQLInsertRecognizer r
for (int i = 0; i < insertColumns.size(); i++) {
String m = insertColumns.get(i);
String params = insertParamsArray[i];
ArrayList<Object> imageListTemp = imageParameterMap.computeIfAbsent(m, k -> new ArrayList<>());
ArrayList<Object> imageListTemp = imageParameterMap.computeIfAbsent(m.toLowerCase(), k -> new ArrayList<>());
if ("?".equals(params.trim())) {
ArrayList<Object> objects = parameters.get(paramsindex);
imageListTemp.addAll(objects);
paramsindex++;
} else if (params instanceof String) {
} else {
// params is character string constant
if ((params.trim().startsWith("'") && params.trim().endsWith("'")) || params.trim().startsWith("\"") && params.trim().endsWith("\"")) {
params = params.trim();
params = params.substring(1, params.length() - 1);
}
imageListTemp.add(params);
} else {
imageListTemp.add(params);
}
imageParameterMap.put(m, imageListTemp);
imageParameterMap.put(m.toLowerCase(), imageListTemp);
}
}
return imageParameterMap;
Expand Down