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

refactoring eloquent.

This commit is contained in:
Taylor Otwell 2011-07-10 23:31:37 -05:00
parent 48419ad321
commit c30185eb27
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
system/db/eloquent.php
View File

@ -274,19 +274,16 @@ public function has_and_belongs_to_many($model, $table = null)
$this->relating_key = strtolower(get_class($this)).'_id'; $this->relating_key = strtolower(get_class($this)).'_id';
$relationship = static::make($model); return static::make($model)
->select(array(static::table($model).'.*'))
$relationship->select(array(static::table($model).'.*')); ->join($this->relating_table, static::table($model).'.id', '=', $this->relating_table.'.'.strtolower($model).'_id')
$relationship->join($this->relating_table, static::table($model).'.id', '=', $this->relating_table.'.'.strtolower($model).'_id'); ->where($this->relating_table.'.'.$this->relating_key, '=', $this->id);
$relationship->where($this->relating_table.'.'.$this->relating_key, '=', $this->id);
return $relationship;
} }
/** /**
* Save the model to the database. * Save the model to the database.
* *
* @return bool * @return void
*/ */
public function save() public function save()
{ {
@ -303,23 +300,28 @@ public function save()
if (property_exists($model, 'timestamps') and $model::$timestamps) if (property_exists($model, 'timestamps') and $model::$timestamps)
{ {
$this->timestamp(); $this->updated_at = date('Y-m-d H:i:s');
if ( ! $this->exists)
{
$this->created_at = $this->updated_at;
}
} }
// If the model already exists in the database, we will just update it.
// Otherwise, we will insert the model and set the ID attribute.
if ($this->exists) if ($this->exists)
{ {
$result = $this->query->where('id', '=', $this->attributes['id'])->update($this->dirty) == 1; $this->query->where('id', '=', $this->attributes['id'])->update($this->dirty);
} }
else else
{ {
$this->attributes['id'] = $this->query->insert_get_id($this->attributes); $this->attributes['id'] = $this->query->insert_get_id($this->attributes);
$result = $this->exists = is_numeric($this->id);
} }
$this->dirty = array(); $this->exists = true;
return $result; $this->dirty = array();
} }
/** /**
@ -338,21 +340,6 @@ public function delete($id = null)
return $this->query->delete(); return $this->query->delete();
} }
/**
* Set the creation and update timestamps on the model.
*
* @return void
*/
private function timestamp()
{
$this->updated_at = date('Y-m-d H:i:s');
if ( ! $this->exists)
{
$this->created_at = $this->updated_at;
}
}
/** /**
* Magic method for retrieving model attributes. * Magic method for retrieving model attributes.
*/ */
@ -405,9 +392,7 @@ public function __isset($key)
*/ */
public function __unset($key) public function __unset($key)
{ {
unset($this->attributes[$key]); unset($this->attributes[$key], $this->ignore[$key], $this->dirty[$key]);
unset($this->ignore[$key]);
unset($this->dirty[$key]);
} }
/** /**