hotline #53376 number of unique through field

src/Storm/Model/Abstract.php

@@ -767,19 +767,8 @@ abstract class Storm_Model_Abstract {
     if (array_key_exists($field, $this->_has_many_attributes))
       return count($this->_has_many_attributes[$field]);
 
-    if (isset($map['through'])) {
-      $through_field = $map['through'];
-
-      $dependents = $this->_get($through_field);
-      if (isset($this->_belongs_to[$through_field]))
-        $dependents = array_filter([$dependents]);
-
-      return array_sum(array_map(
-                         function($dependent) use ($field) {
-                           return $dependent->_numberOf($this->_getDependentFieldNameForInstance($field, $dependent));
-                         },
-                         $dependents));
-    }
+    if (isset($map['through']))
+      return $this->_numberOfThrough($field, $map);
 
     if (isset($this->_belongs_to[$field]))
       return $this->_get($field) ? 1 : 0;
@@ -792,6 +781,25 @@ abstract class Storm_Model_Abstract {
   }
 
 
+  protected function _numberOfThrough($field, $map) {
+    $through_field = $map['through'];
+
+    if (isset($map['unique']) && $map['unique'])
+      return $this->_numberOf($through_field);
+
+    $dependents = $this->_get($through_field);
+    if (isset($this->_belongs_to[$through_field]))
+      $dependents = array_filter([$dependents]);
+
+    return array_sum(array_map(
+                               function($dependent) use ($field) {
+                                 return $dependent->_numberOf($this->_getDependentFieldNameForInstance($field, $dependent));
+                               },
+                               $dependents));
+
+  }
+
+
   /**
    * Update with a [name] => value formatted array
    *