X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FDedupe%2FBAO%2FQueryBuilder%2FIndividualUnsupervised.php;h=fc05be3f70f025415fc88584fa32d99fe2d27814;hb=481a74f476c945a324382bad34630d1a78d704c7;hp=c0d4fc313ec75e26ca03eb59970e89f700b8fad7;hpb=cc9b655cc2686260be3931d5b8ceba0df61abe8b;p=civicrm-core.git diff --git a/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php b/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php index c0d4fc313e..fc05be3f70 100644 --- a/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php +++ b/CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php @@ -1,7 +1,7 @@ params, array()); $params = array( @@ -43,7 +52,12 @@ class CRM_Dedupe_BAO_QueryBuilder_IndividualUnsupervised extends CRM_Dedupe_BAO_ ); } - static function internal($rg) { + /** + * @param $rg + * + * @return array + */ + public static function internal($rg) { $query = " SELECT contact1.id as id1, contact2.id as id2, {$rg->threshold} as weight FROM civicrm_contact as contact1 @@ -61,7 +75,7 @@ class CRM_Dedupe_BAO_QueryBuilder_IndividualUnsupervised extends CRM_Dedupe_BAO_ * An alternative version which might perform a lot better * than the above. Will need to do some testing */ - static function internalOptimized($rg) { + public static function internalOptimized($rg) { $sql = " CREATE TEMPORARY TABLE emails ( email varchar(255), @@ -79,7 +93,7 @@ INSERT INTO emails FROM civicrm_email as email1 JOIN civicrm_email as email2 USING (email) WHERE email1.contact_id < email2.contact_id - AND " . self::internalFilters($rg, "email1.contact_id", "email2.contact_id" ); + AND " . self::internalFilters($rg, "email1.contact_id", "email2.contact_id"); CRM_Core_DAO::executeQuery($sql); $query = " @@ -94,6 +108,3 @@ AND " . self::internalFilters($rg); return array("civicrm_contact.{$rg->name}.{$rg->threshold}" => $query); } }; - - -