Merge remote-tracking branch 'upstream/develop' into develop

laravel/database/connection.php

@@ -194,7 +194,7 @@ class Connection {
 			return $statement->rowCount();
 		}
 		// For insert statements that use the "returning" clause, which is allowed
-		// by databsae systems such as Postgres, we need to actually return the
+		// by database systems such as Postgres, we need to actually return the
 		// real query result so the consumer can get the ID.
 		elseif (stripos($sql, 'insert') === 0 and stripos($sql, 'returning') !== false)
 		{

laravel/database/eloquent/model.php

@@ -253,7 +253,27 @@ abstract class Model {
 	 */
 	public function _with($includes)
 	{
-		$this->includes = (array) $includes;
+		$includes = (array) $includes;
+
+		$all_includes = array();
+
+		foreach($includes as $include)
+		{
+			$nested = explode('.', $include);
+
+			$inc = array();
+
+			foreach($nested as $relation)
+			{
+				$inc[] = $relation;
+
+				$all_includes[] = implode('.', $inc);
+			}
+
+		}
+
+		//remove duplicates and reset the array keys.
+		$this->includes = array_values(array_unique($all_includes));
 
 		return $this;
 	}

laravel/database/schema/grammars/grammar.php

@@ -21,7 +21,7 @@ abstract class Grammar extends \Laravel\Database\Grammar {
 		// command is being executed and the referenced table are wrapped.
 		$table = $this->wrap($table);
 
-		$on = $this->wrap($command->on);
+		$on = $this->wrap_table($command->on);
 
 		// Next we need to columnize both the command table's columns as well as
 		// the columns referenced by the foreign key. We'll cast the referenced

laravel/database/schema/grammars/mysql.php

@@ -418,4 +418,4 @@ class MySQL extends Grammar {
 		return 'BLOB';
 	}
 
-}
+}

laravel/database/schema/table.php

@@ -393,9 +393,7 @@ class Table {
 	{
 		$parameters = array_merge(compact('type'), $parameters);
 
-		$this->commands[] = new Fluent($parameters);
-
-		return end($this->commands);
+		return $this->commands[] = new Fluent($parameters);
 	}
 
 	/**
@@ -409,9 +407,7 @@ class Table {
 	{
 		$parameters = array_merge(compact('type'), $parameters);
 
-		$this->columns[] = new Fluent($parameters);
-
-		return end($this->columns);
+		return $this->columns[] = new Fluent($parameters);
 	}
 
 }