dev/core#1597 & dev/core#1595 fix regression when deduping on custom fields #16558
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
eileenmcnaughton
changed the title
|
@eileenmcnaughton i tested this however i ran into an e-notice |
eileenmcnaughton
force-pushed
the
523dupe
branch
from
e5350a6
to
133c6c0
Compare
|
@seamuslee001 try again now |
|
@eileenmcnaughton test fails relate maybe need to supply a test data provider or something |
eileenmcnaughton
force-pushed
the
523dupe
branch
2 times, most recently
from
9d1adf2
to
dbe5276
Compare
|
It must be cleanup |
eileenmcnaughton
force-pushed
the
523dupe
branch
4 times, most recently
from
ebe5c3d
to
8b7b236
Compare
|
test this please |
|
Jenkins re test this please |
CRM/Core/DAO.php
Outdated
| @@ -2578,7 +2578,7 @@ public static function buildOptionsContext($context = NULL) { | |||
| * @param string $fieldName | |||
| * @return bool|array | |||
| */ | |||
| public function getFieldSpec($fieldName) { | |||
There was a problem hiding this comment.
@eileenmcnaughton this is change is causing karma to not run successfully
eileenmcnaughton
force-pushed
the
523dupe
branch
from
8b7b236
to
692e041
Compare
|
unrelated fail |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Fixes a regression where dedupe rules were failing when a custom field is the match field
Before
Create a dedupe rule with just a custom field as the critieria & try to use it -> fatal (bonus points use a custom date field - which would have already been broken)
After
Custom fields work in a rule
Technical Details
Some time back we started retrieving the metadata for fields because date fields need to be treated differently in the sql. The retrieval method assumed table_name was the Entity but for custom fields that was not the case - so marriage date would have resulted in bad sql but birth_date would have worked. More recently we tightened civicrm_api3() to fail if $entity was NULL so passing NULL entity became a had error (making it fail on all custom fields -not just date custom fields).
This fixes to get the entity correctly for custom fields & adds a test ensuring no fatal
Comments