Fixing bugs in database layer.

laravel/database/eloquent/relationships/relationship.php

@@ -24,11 +24,21 @@ abstract class Relationship extends Query {
 	{
 		$this->foreign = $foreign;
 
-		// We will go ahead and set the model and associated instances on the relationship
+		// We will go ahead and set the model and associated instances on the
-		// to match the relationship targets passed in from the model. These will allow
+		// relationship to match the relationship targets passed in from the
-		// us to gather more inforamtion on the relationship.
+		// model. These will allow us to gather the relationship info.
-		$this->model = ($associated instanceof Model) ? $associated : new $associated;
+		if ($associated instanceof Model)
+		{
+			$this->model = $associated;
+		}
+		else
+		{
+			$this->model = new $associated;
+		}
 
+		// For relationships, we'll set the base model to be the model being
+		// associated from. This model contains the value of the foreign
+		// key needed to connect to the associated model.
 		if ($model instanceof Model)
 		{
 			$this->base = $model;
@@ -38,9 +48,9 @@ abstract class Relationship extends Query {
 			$this->base = new $model;
 		}
 
-		// Next we'll set the fluent query builder for the relationship and constrain
+		// Next we'll set the fluent query builder for the relationship and
-		// the query such that it only returns the models that are appropriate for
+		// constrain the query such that it only returns the models that
-		// the relationship, typically by setting the foreign key.
+		// are appropriate for the relationship.
 		$this->table = $this->query();
 
 		$this->constrain();

laravel/database/schema/table.php

@@ -136,7 +136,7 @@ class Table {
 		// the index that can be used when dropping indexes.
 		if (is_null($name))
 		{
-			$name = $this->name.implode('_', $columns).'_'.$type;
+			$name = $this->name.'_'.implode('_', $columns).'_'.$type;
 		}
 
 		return $this->command($type, compact('name', 'columns'));