Skip to content
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

Allow certain domain duplicates #3466

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Allow certain domain duplicates #3466

merged 1 commit into from
Jun 3, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jun 2, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

Improvement for a discussion on Discoursed (liked below).

How does this PR accomplish the above?:

Change UNIQUEness constraint from (domain) to (domain, type) in the domainlist table. This will allow duplicates which can be associated to different groups.

The update will be applied transparently during the next pihole -g run. We do not need to update the gravity DB version here.

What documentation changes (if any) are needed to support this PR?:

None

@DL6ER
Change UNIQUEness constraint from (domain) to (domain, type) in the d…
202ba05 
…omainlist table. This will allow duplicates which can be associated to different groups.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added this to the v5.1 milestone Jun 2, 2020
@DL6ER DL6ER requested a review from PromoFaux June 2, 2020 08:57
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/slight-bug-in-blacklist-uniqueness-constraint/33791/20

PromoFaux
PromoFaux approved these changes Jun 3, 2020
View reviewed changes
Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The update will be applied transparently during the next pihole -g run.

Confirmed

@PromoFaux PromoFaux merged commit 13a49b0 into development Jun 3, 2020
@PromoFaux PromoFaux deleted the tweak/improve_unique_domains branch June 3, 2020 20:41
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/regex-engine-improvements/34751/12

@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
Merged
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/display-blocked-deep-cname-domains-in-pi-hole-tail-query/32297/29

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

@yubiuser yubiuser mentioned this pull request Jul 16, 2020
Closed
3 tasks
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/lists-cant-add-identical-url-twice/68261/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

Assignees
No one assigned
Labels
Enhancement
Projects
None yet
Milestone
v5.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@DL6ER @pralor-bot @PromoFaux