Use insert instead of insertGetId when using custom primary key

analogueorm · May 16, 2015 · e1ad662 · e1ad662
1 parent 4d1a7f6
commit e1ad662
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Commands/Store.php b/src/Commands/Store.php
@@ -642,11 +642,19 @@ protected function insert()
 
 		$attributes = $this->getRawAttributes();
 
-		$id = $this->query->insertGetId($attributes);
-
 		$keyName = $this->entityMap->getKeyName();
-
-		$entity->setEntityAttribute($keyName, $id);
+
+		// Check if the primary key is defined in the attributes
+		if(array_key_exists($keyName, $attributes))
+		{
+			$this->query->insert($attributes);
+		}	
+		else
+		{
+			$id = $this->query->insertGetId($attributes);
+
+			$entity->setEntityAttribute($keyName, $id);
+		}
 	}
 
 	/**

diff --git a/tests/AnalogueTest/DomainTest.php b/tests/AnalogueTest/DomainTest.php
@@ -252,9 +252,9 @@ public function testSelfGeneratedPrimaryKey()
         $uuid = new Uuid('test', 'testlabel');
         $um = get_mapper($uuid);
         $um->store($uuid);
-
+        $this->assertEquals('test', $uuid->uuid);
         $uuid = $um->where('uuid', '=', 'test')->first();
-
+        $this->assertEquals('test', $uuid->uuid);
         $this->assertEquals('testlabel', $uuid->label);
 
     }

diff --git a/tests/test.sqlite b/tests/test.sqlite