Skip to content

Develop#117

Merged
Rabithua merged 3 commits intomainfrom
develop
Dec 8, 2025
Merged

Develop#117
Rabithua merged 3 commits intomainfrom
develop

Conversation

@Rabithua
Copy link
Copy Markdown
Owner

@Rabithua Rabithua commented Dec 8, 2025

No description provided.

…gration

- Add targetBindingSet to check for exact (provider, providerId) combinations
- Add triple-layer validation: provider check, exact binding check, and database query
- Add try-catch around insert to handle unique constraint violations gracefully
- Improve error messages and logging for better debugging
- This should prevent duplicate key violations during account merge
… merge

修复账户合并时 OAuth 绑定的唯一约束冲突问题。将 INSERT 操作改为 UPDATE 操作,
直接更新绑定记录的 userid,避免触发 unique_provider_id 约束。

- 将 OAuth 绑定迁移从 INSERT 改为 UPDATE 操作
- 简化冗余的双重验证逻辑
- 移除未使用的 and 导入
- 保留完整的错误处理和日志记录
删除冗余注释,保留关键业务逻辑说明,提高代码可读性。

- 删除显而易见的代码说明注释
- 简化章节标题,移除括号内的表名说明
- 保留重要的业务策略和约束说明
- 保持代码简洁清晰,符合最佳实践
@Rabithua Rabithua merged commit 7d0320c into main Dec 8, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant