Merge pull request #18151 from zexi/automated-cherry-pick-of-#18124-upstream-release-3.11

Automated cherry pick of #18124: fix: charset mismatch in tenant cache convert_ids
This commit is contained in:
Zexi Li
2023-09-25 16:58:33 +08:00
committed by GitHub
+1 -1
View File
@@ -581,7 +581,7 @@ func (manager *STenantCacheManager) ConvertIds(ids []string, isDomain bool) ([]s
q = manager.GetTenantQuery("id")
}
q = q.Filter(sqlchemy.OR(
sqlchemy.In(q.Field("id"), ids),
sqlchemy.In(q.Field("id"), stringutils2.RemoveUtf8Strings(ids)),
sqlchemy.In(q.Field("name"), ids),
))
q = q.Distinct()