Refactoring Eloquent class.

This commit is contained in:
Taylor Otwell 2011-07-08 07:09:43 -07:00
parent 743cf6f44a
commit 666ebf2119
1 changed files with 42 additions and 23 deletions

View File

@ -295,37 +295,43 @@ public function save()
$model = get_class($this); $model = get_class($this);
// Since the model was instantiated using "new", a query instance has not been set. // Since the model was instantiated using "new", a query instance has not been set.
// Only models being used for querying have their query instances set by default.
$this->query = Query::table(static::table($model)); $this->query = Query::table(static::table($model));
// Set the creation and update timestamps.
if (property_exists($model, 'timestamps') and $model::$timestamps) if (property_exists($model, 'timestamps') and $model::$timestamps)
{ {
$this->updated_at = date('Y-m-d H:i:s'); $this->timestamp();
if ( ! $this->exists)
{
$this->created_at = $this->updated_at;
}
} }
// If the model already exists in the database, we only need to update it. $result = ($this->exists) ? $this->update() : $this->insert();
// Otherwise, we'll insert the model into the database.
if ($this->exists)
{
$result = $this->query->where('id', '=', $this->attributes['id'])->update($this->dirty) == 1;
}
else
{
$this->attributes['id'] = $this->query->insert_get_id($this->attributes);
$result = $this->exists = is_numeric($this->id);
}
$this->dirty = array(); $this->dirty = array();
return $result; return $result;
} }
/**
* Update an existing model in the database.
*
* @return bool
*/
private function update()
{
return $this->query->where('id', '=', $this->attributes['id'])->update($this->dirty) == 1;
}
/**
* Insert a new model into the database.
*
* @return bool
*/
private function insert()
{
$this->attributes['id'] = $this->query->insert_get_id($this->attributes);
return $this->exists = is_numeric($this->id);
}
/** /**
* Delete a model from the database. * Delete a model from the database.
* *
@ -342,20 +348,33 @@ public function delete($id = null)
return 0; return 0;
} }
/**
* 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.
*/ */
public function __get($key) public function __get($key)
{ {
// Check the ignored attributes first. These attributes hold all of the // The ignored attributes hold all of the loaded relationships for the model.
// loaded relationships for the model.
if (array_key_exists($key, $this->ignore)) if (array_key_exists($key, $this->ignore))
{ {
return $this->ignore[$key]; return $this->ignore[$key];
} }
// Is the attribute actually a relationship method? If it is, return the // If the attribute is a relationship method, return the related models.
// models for the relationship.
if (method_exists($this, $key)) if (method_exists($this, $key))
{ {
$model = $this->$key(); $model = $this->$key();