8000 fix: duplicate unique indexes (backport #19291) by mergify[bot] · Pull Request #19296 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: duplicate unique indexes (backport #19291) #19296

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

Jump to bottom
Merged
merged 5 commits into from
Dec 15, 2022
Merged

fix: duplicate unique indexes (backport #19291) #19296

merged 5 commits into from
Dec 15, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Dec 15, 2022

This is an automatic backport of pull request #19291 done by Mergify.
Cherry-pick of 8df845c has failed:

On branch mergify/bp/version-13-hotfix/pr-19291
Your branch is ahead of 'origin/version-13-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8df845ca35.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/database/schema.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/database/mariadb/schema.py
	both modified:   frappe/tests/test_db_update.py

Cherry-pick of 56e1bf3 has failed:

On branch mergify/bp/version-13-hotfix/pr-19291
Your branch is ahead of 'origin/version-13-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 56e1bf31d7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/patches.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/patches/v12_0/delete_duplicate_indexes.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ankush @mergify
test: unique index on install and alter
ea4a2bb 
There should always be 1 unique index.

(cherry picked from commit d27ea5e)
@ankush @mergify
fix: duplicate unique index when column is altered
20d927b 
(cherry picked from commit 8df845c)

# Conflicts:
#	frappe/database/mariadb/schema.py
#	frappe/tests/test_db_update.py
@ankush @mergify
fix: patch to delete duplicate uniq indexes
018306f 
(cherry picked from commit 56e1bf3)

# Conflicts:
#	frappe/patches/v12_0/delete_duplicate_indexes.py
@mergify mergify bot requested review from a team and shariquerik and removed request for a team December 15, 2022 08:07
@mergify mergify bot added the conflicts label Dec 15, 2022
@mergify mergify bot assigned ankush Dec 15, 2022
@ankush ankush added squash and removed conflicts labels Dec 15, 2022
@ankush ankush merged commit b6e58a9 into version-13-hotfix Dec 15, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-19291 branch December 15, 2022 09:05
frappe-pr-bot pushed a commit that referenced this pull request Dec 20, 2022
@frappe-bot
chore(release): Bumped to Version 13.46.1
9f46c26 
## [13.46.1](v13.46.0...v13.46.1) (2022-12-20)

### Bug Fixes

* allow zero page length in `get_list` to return complete list ([#19322](#19322)) ([#19340](#19340)) ([0dfa23d](0dfa23d))
* datepicker not working for arabic language ([7570256](7570256))
* dont share with self for standard users (backport [#19327](#19327)) ([#19337](#19337)) ([7d93bf0](7d93bf0))
* duplicate unique indexes (backport [#19291](#19291)) ([#19296](#19296)) ([b6e58a9](b6e58a9))
* move filelock import inside function ([e642684](e642684))
* restore missing `helpful` and `not_helpful` fields to help article doctype. (backport [#19309](#19309)) ([#19315](#19315)) ([90c4023](90c4023)), closes [#diff-3e0e1befb66af4c2ab84c6fe0e996dc602d906817f0b00b6239120af9da9be46](https://github.com/frappe/frappe/issues/diff-3e0e1befb66af4c2ab84c6fe0e996dc602d906817f0b00b6239120af9da9be46)
* untranslated link fields in list view ([#19155](#19155)) ([57b109e](57b109e))
* use stricter regex for `sanitize_searchfield` ([#19302](#19302)) ([1fbca36](1fbca36))
* **UX:** Redirect after submitting webform ([#19318](#19318)) ([d25a26b](d25a26b))

### Performance Improvements

* reuse `_doc_before_save` in `doc.get_latest` (backport [#19326](#19326)) ([#19345](#19345)) ([757b042](757b042))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.46.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shariquerik shariquerik Awaiting requested review from shariquerik

Assignees

@ankush ankush

Labels
released squash
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush
0