fix buildKey failed

Signed-off-by: charlie <[email protected]>

pkg/datasource/sql/exec/at/select_for_update_executor_test.go

@@ -76,9 +76,7 @@ func TestBuildSelectPKSQL(t *testing.T) {
 
 	selSQL, err := e.buildSelectPKSQL(ctx.SelectStmt, &metaData)
 	assert.Nil(t, err)
-	equal := "SELECT SQL_NO_CACHE order_id,id FROM t_user WHERE age>? FOR UPDATE" == selSQL ||
-		"SELECT SQL_NO_CACHE id,order_id FROM t_user WHERE age>? FOR UPDATE" == selSQL
-	assert.Equal(t, equal, true)
+	assert.Equal(t, "SELECT SQL_NO_CACHE id,order_id FROM t_user WHERE age>? FOR UPDATE" == selSQL, true)
 }
 
 func TestBuildLockKey(t *testing.T) {
@@ -123,6 +121,7 @@ func TestBuildLockKey(t *testing.T) {
 				ColumnName:         "age",
 			},
 		},
+		ColumnNames: []string{"id", "order_id", "age"},
 	}
 	rows := mockRows{}
 	lockKey := e.buildLockKey(rows, &metaData)

pkg/datasource/sql/types/meta.go

@@ -20,6 +20,7 @@ package types
 import (
 	"fmt"
 	"reflect"
+	"sort"
 )
 
 // ColumnMeta
@@ -119,6 +120,18 @@ func (m TableMeta) GetPrimaryKeyOnlyName() []string {
 			}
 		}
 	}
+
+	// need sort again according the m.ColumnNames
+	order := make(map[string]int, len(m.ColumnNames))
+	for i, name := range m.ColumnNames {
+		order[name] = i
+	}
+	sort.Slice(keys, func(i, j int) bool {
+		if order == nil {
+			return false
+		}
+		return order[keys[i]] < order[keys[j]]
+	})
 	return keys
 }