Skip to content

Commit

Permalink
fix: bypassing modifying the primary key (#727)
Browse files Browse the repository at this point in the history
* adjust unit tests to verify the issue of "bypassing modifying the primary key"

* fix: bypass modify the primary key
  • Loading branch information
FinnTew authored Dec 14, 2024
1 parent e251741 commit 6bf7b94
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (u *MySQLInsertOnDuplicateUndoLogBuilder) buildBeforeImageSQL(insertStmt *a
columnIsNull := true
uniqueList := make([]string, 0)
for _, columnMeta := range index.Columns {
columnName := columnMeta.ColumnName
columnName := strings.ToLower(columnMeta.ColumnName)
imageParameters, ok := paramMap[columnName]
if !ok && columnMeta.ColumnDef != nil {
if strings.EqualFold("PRIMARY", index.Name) {
Expand Down Expand Up @@ -222,7 +222,7 @@ func (u *MySQLInsertOnDuplicateUndoLogBuilder) buildAfterImageSQL(ctx context.Co
func checkDuplicateKeyUpdate(insert *ast.InsertStmt, metaData types.TableMeta) error {
duplicateColsMap := make(map[string]bool)
for _, v := range insert.OnDuplicate {
duplicateColsMap[v.Column.Name.L] = true
duplicateColsMap[strings.ToLower(v.Column.Name.L)] = true
}
if len(duplicateColsMap) == 0 {
return nil
Expand Down Expand Up @@ -254,7 +254,7 @@ func (u *MySQLInsertOnDuplicateUndoLogBuilder) buildImageParameters(insert *ast.
return nil, fmt.Errorf("insert row's column size not equal to insert column size")
}
for i, col := range insertColumns {
columnName := executor.DelEscape(col, types.DBTypeMySQL)
columnName := strings.ToLower(executor.DelEscape(col, types.DBTypeMySQL))
val := row[i]
rStr, ok := val.(string)
if ok && strings.EqualFold(rStr, SqlPlaceholder) {
Expand All @@ -279,14 +279,14 @@ func getInsertColumns(insertStmt *ast.InsertStmt) []string {
}
var list []string
for _, col := range colList {
list = append(list, col.Name.L)
list = append(list, strings.ToLower(col.Name.L))
}
return list
}

func isIndexValueNotNull(indexMeta types.IndexMeta, imageParameterMap map[string][]driver.Value, rowIndex int) bool {
for _, colMeta := range indexMeta.Columns {
columnName := colMeta.ColumnName
columnName := strings.ToLower(colMeta.ColumnName)
imageParameters := imageParameterMap[columnName]
if imageParameters == nil && colMeta.ColumnDef == nil {
return false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestInsertOnDuplicateBuildBeforeImageSQL(t *testing.T) {
)
columnId := types.ColumnMeta{
ColumnDef: nil,
ColumnName: "id",
ColumnName: "ID",
}
columnName := types.ColumnMeta{
ColumnDef: nil,
Expand All @@ -56,12 +56,12 @@ func TestInsertOnDuplicateBuildBeforeImageSQL(t *testing.T) {
ColumnDef: nil,
ColumnName: "age",
}
columns["id"] = columnId
columns["ID"] = columnId
columns["name"] = columnName
columns["age"] = columnAge
columnMeta1 = append(columnMeta1, columnId)
columnMeta2 = append(columnMeta2, columnName, columnAge)
index["id"] = types.IndexMeta{
index["ID"] = types.IndexMeta{
Name: "PRIMARY",
IType: types.IndexTypePrimaryKey,
Columns: columnMeta1,
Expand All @@ -72,7 +72,7 @@ func TestInsertOnDuplicateBuildBeforeImageSQL(t *testing.T) {
Columns: columnMeta2,
}

ColumnNames = []string{"id", "name", "age"}
ColumnNames = []string{"ID", "name", "age"}
tableMeta1 = types.TableMeta{
TableName: "t_user",
Columns: columns,
Expand Down

0 comments on commit 6bf7b94

Please sign in to comment.