Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow Model instance an id for first argument in Has_Many_And_Belongs_To::attach() and same for ::detach(). Also a typo fix for the docblock on attach().

This commit is contained in:
anaxamaxan 2012-06-13 16:23:28 -07:00
parent b27b132128
commit 19a3e9dc2b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@ -85,12 +85,14 @@ public function results()
/** /**
* Insert a new record into the joining table of the association. * Insert a new record into the joining table of the association.
* *
* @param int $id * @param Model|int $id
* @param array $joining * @param array $attributes
* @return bool * @return bool
*/ */
public function attach($id, $attributes = array()) public function attach($id, $attributes = array())
{ {
if ($id instanceof Model) $id = $id->get_key();
$joining = array_merge($this->join_record($id), $attributes); $joining = array_merge($this->join_record($id), $attributes);
return $this->insert_joining($joining); return $this->insert_joining($joining);
@ -99,12 +101,13 @@ public function attach($id, $attributes = array())
/** /**
* Detach a record from the joining table of the association. * Detach a record from the joining table of the association.
* *
* @param int $ids * @param array|Model|int $ids
* @return bool * @return bool
*/ */
public function detach($ids) public function detach($ids)
{ {
if ( ! is_array($ids)) $ids = array($ids); if ($ids instanceof Model) $ids = array($ids->get_key());
elseif ( ! is_array($ids)) $ids = array($ids);
return $this->pivot()->where_in($this->other_key(), $ids)->delete(); return $this->pivot()->where_in($this->other_key(), $ids)->delete();
} }