From 75f63847673f241463c00f42134277039b0e38c2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 30 Mar 2012 08:41:52 -0500 Subject: [PATCH 1/2] fix eloquent->delete bug. --- laravel/database/eloquent/model.php | 13 +++++++++++++ .../relationships/has_many_and_belongs_to.php | 4 +--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/laravel/database/eloquent/model.php b/laravel/database/eloquent/model.php index 763cd46f..d9c88396 100644 --- a/laravel/database/eloquent/model.php +++ b/laravel/database/eloquent/model.php @@ -378,6 +378,19 @@ public function save() return $result; } + /** + * Delete the model from the database. + * + * @return int + */ + public function delete() + { + if ($this->exists) + { + return $this->query()->where(static::$key, '=', $this->get_key())->delete(); + } + } + /** * Set the update and creation timestamps on the model. * diff --git a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php index 225f7eb8..7453a02f 100644 --- a/laravel/database/eloquent/relationships/has_many_and_belongs_to.php +++ b/laravel/database/eloquent/relationships/has_many_and_belongs_to.php @@ -125,9 +125,7 @@ public function insert($attributes, $joining = array()) */ public function delete() { - $id = $this->base->get_key(); - - return $this->joining_table()->where($this->foreign_key(), '=', $id)->delete(); + return $this->pivot()->delete(); } /** From 6aaf015cff285fa266589eb45d780bf93f64e236 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 30 Mar 2012 08:43:10 -0500 Subject: [PATCH 2/2] incremented version and change log. --- artisan | 2 +- changes.md | 11 +++++++++++ paths.php | 2 +- public/index.php | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/artisan b/artisan index 68e645ea..6034de07 100644 --- a/artisan +++ b/artisan @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/changes.md b/changes.md index 761388b9..f1a3bc51 100644 --- a/changes.md +++ b/changes.md @@ -2,6 +2,8 @@ ## Laravel Change Log ## Contents +- [Laravel 3.1.3](#3.1.3) +- [Upgrading From 3.1.2](#uprade-3.1.3) - [Laravel 3.1.2](#3.1.2) - [Upgrading From 3.1.1](#upgrade-3.1.2) - [Laravel 3.1.1](#3.1.1) @@ -9,6 +11,15 @@ ## Contents - [Laravel 3.1](#3.1) - [Upgrading From 3.0](#upgrade-3.1) + +## Laravel 3.1.3 + +- Fixes **delete** method in Eloquent models. + + + +- Replace the **laravel** folder. + ## Laravel 3.1.2 diff --git a/paths.php b/paths.php index 7d9e1906..729a2697 100644 --- a/paths.php +++ b/paths.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */ diff --git a/public/index.php b/public/index.php index 42b6a438..9f78eb6e 100644 --- a/public/index.php +++ b/public/index.php @@ -3,7 +3,7 @@ * Laravel - A PHP Framework For Web Artisans * * @package Laravel - * @version 3.1.2 + * @version 3.1.3 * @author Taylor Otwell * @link http://laravel.com */