updateUniques now has a bit more flexibility, Reflection methods removed from buildUniqueExclusionRules

Author: nightowl77

src/LaravelBook/Ardent/Ardent.php

@@ -759,44 +759,27 @@ protected function buildUniqueExclusionRules(array $rules = array()) {
             $ruleset = (is_string($ruleset))? explode('|', $ruleset) : $ruleset;
 
             foreach ($ruleset as &$rule) {
-              if (strpos($rule, 'unique') === 0) {
-                $params = explode(',', $rule);
-
-                $uniqueRules = array();
-                
-                // Append table name if needed
-                $table = explode(':', $params[0]);
-                if (count($table) == 1)
-                  $uniqueRules[1] = $this->table;
-                else
-                  $uniqueRules[1] = $table[1];
-               
-                // Append field name if needed
-                if (count($params) == 1)
-                  $uniqueRules[2] = $field;
-                else
-                  $uniqueRules[2] = $params[1];
-
-                if (isset($this->primaryKey)) {
-                  $uniqueRules[3] = $this->{$this->primaryKey};
-                  $uniqueRules[4] = $this->primaryKey;
-                }
-                else {
-                  $uniqueRules[3] = $this->id;
+                if (strpos($rule, 'unique') === 0) {
+                    $params = explode(',', $rule);
+
+                    // Append field name if needed
+                    if (count($params) == 1) {
+                        $params[1] = $field;
+                    }
+
+                     // if the 3rd param was set, do not overwrite it
+                    if (!is_numeric(@$params[2])) $params[2] = $this->id;
+                   
+                    $rule = implode(',', $params);
                 }
-       
-                $rule = 'unique:' . implode(',', $uniqueRules);  
-              } // end if strpos unique
-              
-            } // end foreach ruleset
+            }
         }
-        
+
         return $rules;
     }
 
     /**
-     * Update a model, but filter uniques first to ensure a unique validation rule
-     * does not fire
+     * Update a model already saved in the database.
      *
      * @param array   $rules
      * @param array   $customMessages