Merge remote-tracking branch 'origin/master'

Author: taylorotwell

readme.md

@@ -47,4 +47,5 @@
 - Added `auth:reminders` Artisan command for generating a migration for the password reminders table.
 - Added `App::fatal` method for registering an error listener for PHP fatal errors.
 - Added `session:table` Artisan command for generating a migration for the session database table.
-- Fix bug when using `first` method on a `belongsToMany` relationship.
+- Fix bug when using `first` method on a `belongsToMany` relationship.
+- Added SQL and bindings array to database query exceptions.

src/Illuminate/Auth/Console/stubs/reminders.php

@@ -11,7 +11,7 @@ class CreatePasswordRemindersTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('password_reminders', function($t)
+		Schema::create('password_reminders', function($t)
 		{
 			$t->string('email');
 			$t->string('token');
@@ -29,4 +29,4 @@ public function down()
 		Schema::drop('password_reminders');
 	}
 
-}
+}

src/Illuminate/Database/Connection.php

@@ -437,15 +437,42 @@ protected function run($query, $bindings, Closure $callback)
 		// To execute the statement, we'll simply call the callback, which will actually
 		// run the SQL against the PDO connection. Then we can calculate the time it
 		// took to execute and log the query SQL, bindings and time in our memory.
-		$result = $callback($this, $query, $bindings);
+		try
+		{
+			$result = $callback($this, $query, $bindings);
+		}
+		catch (\Exception $e)
+		{
+			$this->handleQueryException($e, $query, $bindings);
+		}
 
+		// Once we have run the query we will calculate the time that it took to run and
+		// then log the query, bindings, and execution time so we will report them on
+		// the event that the developer needs them. We'll log time in milliseconds.
 		$time = number_format((microtime(true) - $start) * 1000, 2);
 
 		$this->logQuery($query, $bindings, $time);
 
 		return $result;
 	}
 
+	/**
+	 * Handle an exception that occurred during a query.
+	 *
+	 * @param  Exception  $e
+	 * @param  string     $query
+	 * @param  array      $bindings
+	 * @return void
+	 */
+	protected function handleQueryException(\Exception $e, $query, $bindings)
+	{
+		$bindings = var_export($bindings, true);
+
+		$message = $e->getMessage()." (SQL: {$query}) (Bindings: {$bindings})";
+
+		throw new \Exception($message, 0);	
+	}
+
 	/**
 	 * Log a query in the connection's query log.
 	 *

src/Illuminate/Session/Console/stubs/database.php

@@ -11,7 +11,7 @@ class CreateSessionTable extends Migration {
 	 */
 	public function up()
 	{
-		Schema::table('sessions', function($t)
+		Schema::create('sessions', function($t)
 		{
 			$t->string('id')->unique();
 			$t->text('payload');
@@ -29,4 +29,4 @@ public function down()
 		Schema::drop('sessions');
 	}
 
-}
+}