Fix custom pivot timestamp column names

lukasgeiter · lukasgeiter · commit 8d3910ff04eb · 2015-05-12T21:42:03.000+02:00
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php b/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
@@ -50,6 +50,20 @@ class BelongsToMany extends Relation {
 	 */
 	protected $pivotWheres = [];
 
+	/**
+	 * The custom pivot table column for the created_at timestamp.
+	 *
+	 * @var array
+	 */
+	protected $pivotCreatedAt;
+
+	/**
+	 * The custom pivot table column for the updated_at timestamp.
+	 *
+	 * @var array
+	 */
+	protected $pivotUpdatedAt;
+
 	/**
 	 * Create a new belongs to many relationship instance.
 	 *
@@ -1129,7 +1143,30 @@ public function withPivot($columns)
 	 */
 	public function withTimestamps($createdAt = null, $updatedAt = null)
 	{
-		return $this->withPivot($createdAt ?: $this->createdAt(), $updatedAt ?: $this->updatedAt());
+		$this->pivotCreatedAt = $createdAt;
+		$this->pivotUpdatedAt = $updatedAt;
+
+		return $this->withPivot($this->createdAt(), $this->updatedAt());
+	}
+
+	/**
+	 * Get the name of the "created at" column.
+	 *
+	 * @return string
+	 */
+	public function createdAt()
+	{
+		return $this->pivotCreatedAt ?: $this->parent->getCreatedAtColumn();
+	}
+
+	/**
+	 * Get the name of the "updated at" column.
+	 *
+	 * @return string
+	 */
+	public function updatedAt()
+	{
+		return $this->pivotUpdatedAt ?: $this->parent->getUpdatedAtColumn();
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentBelongsToManyTest.php b/tests/Database/DatabaseEloquentBelongsToManyTest.php
@@ -180,6 +180,22 @@ public function testAttachInsertsPivotTableRecordWithTimestampsWhenNecessary()
 	}
 
 
+	public function testAttachInsertsPivotTableRecordWithCustomTimestampColumns()
+	{
+		$relation = $this->getMock('Illuminate\Database\Eloquent\Relations\BelongsToMany', array('touchIfTouching'), $this->getRelationArguments());
+		$relation->withTimestamps('custom_created_at', 'custom_updated_at');
+		$query = m::mock('stdClass');
+		$query->shouldReceive('from')->once()->with('user_role')->andReturn($query);
+		$query->shouldReceive('insert')->once()->with(array(array('user_id' => 1, 'role_id' => 2, 'foo' => 'bar', 'custom_created_at' => 'time', 'custom_updated_at' => 'time')))->andReturn(true);
+		$relation->getQuery()->shouldReceive('getQuery')->andReturn($mockQueryBuilder = m::mock('StdClass'));
+		$mockQueryBuilder->shouldReceive('newQuery')->once()->andReturn($query);
+		$relation->getParent()->shouldReceive('freshTimestamp')->once()->andReturn('time');
+		$relation->expects($this->once())->method('touchIfTouching');
+
+		$relation->attach(2, array('foo' => 'bar'));
+	}
+
+
 	public function testAttachInsertsPivotTableRecordWithACreatedAtTimestamp()
 	{
 		$relation = $this->getMock('Illuminate\Database\Eloquent\Relations\BelongsToMany', array('touchIfTouching'), $this->getRelationArguments());
