Skip to content

fix!: 组合主键格式修复 #111

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

Open
jay-youngn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix!: 组合主键格式修复 #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
017109a
fix!: 组合主键格式调整，消除歧义
jay-youngn Mar 24, 2022
b5abfe1
perf: fixed length slice
jay-youngn Apr 24, 2023
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
20 changes: 11 additions & 9 deletions service/endpoint/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,19 +306,21 @@ func oldRowMap(req *model.RowRequest, rule *global.Rule, primitive bool) map[str
return kv
}

// primaryKey 自适应获取主键
func primaryKey(re *model.RowRequest, rule *global.Rule) interface{} {
if rule.IsCompositeKey { // 组合ID
var key string
if rule.IsCompositeKey {
vList := make([]string, len(rule.TableInfo.PKColumns))
for _, index := range rule.TableInfo.PKColumns {
key += stringutil.ToString(re.Row[index])
vList[index] = stringutil.ToString(re.Row[index])
}
return key
} else {
index := rule.TableInfo.PKColumns[0]
data := re.Row[index]
column := rule.TableInfo.Columns[index]
return convertColumnData(data, &column, rule)
return strings.Join(vList, "_")
}

index := rule.TableInfo.PKColumns[0]
data := re.Row[index]
column := rule.TableInfo.Columns[index]

return convertColumnData(data, &column, rule)
}

func elsHosts(addr string) []string {
Expand Down