Casting "insertGetId" as an integer where appropriate. Fixes laravel#377.

bencorlett · bencorlett · commit 1c332f57f294 · 2013-02-24T09:36:06.000-05:00
Signed-off-by: Ben Corlett &lt;bencorlett@me.com&gt;
diff --git a/src/Illuminate/Database/Query/Processors/Processor.php b/src/Illuminate/Database/Query/Processors/Processor.php
@@ -29,7 +29,17 @@ public function processInsertGetId(Builder $query, $sql, $values, $sequence = nu
 	{
 		$query->getConnection()->insert($sql, $values);
 
-		return $query->getConnection()->getPdo()->lastInsertId($sequence);
+		// If the table has an incrementing primary key, we will
+		// receive the ID back as the next incremental value of
+		// the primary key. However, sometimes we won't have
+		// incrementing primary keys, in which case casting as
+		// an ID would return 0.
+		if (is_numeric($id = $query->getConnection()->getPdo()->lastInsertId($sequence)))
+		{
+			return (int) $id;
+		}
+
+		return $id;
 	}
 
-}
+}
diff --git a/tests/Database/DatabaseProcessorTest.php b/tests/Database/DatabaseProcessorTest.php
@@ -13,15 +13,15 @@ public function tearDown()
 	public function testInsertGetIdProcessing()
 	{
 		$pdo = $this->getMock('ProcessorTestPDOStub');
-		$pdo->expects($this->once())->method('lastInsertId')->with($this->equalTo('id'))->will($this->returnValue(1));
+		$pdo->expects($this->once())->method('lastInsertId')->with($this->equalTo('id'))->will($this->returnValue('1'));
 		$connection = m::mock('Illuminate\Database\Connection');
 		$connection->shouldReceive('insert')->once()->with('sql', array('foo'));
 		$connection->shouldReceive('getPdo')->once()->andReturn($pdo);
 		$builder = m::mock('Illuminate\Database\Query\Builder');
 		$builder->shouldReceive('getConnection')->andReturn($connection);
 		$processor = new Illuminate\Database\Query\Processors\Processor;
 		$result = $processor->processInsertGetId($builder, 'sql', array('foo'), 'id');
-		$this->assertEquals(1, $result);
+		$this->assertSame(1, $result);
 	}
 
 }
@@ -31,4 +31,4 @@ class ProcessorTestPDOStub extends PDO {
 	public function __construct() {}
 	public function lastInsertId($sequence = null) {}
 
-}
+}
