From 97b03745b0d2fb74bc2574f639aec896bbddac16 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sat, 15 Dec 2018 14:05:11 +0100
Subject: [PATCH] Fetch lastInsertId only when id null

When id column has no autoincrement flag query for lastInsertId fails
on postgres because no value has been generated. Call lastInsertId only
if id is null.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 lib/public/AppFramework/Db/QBMapper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index dbc47d2d43d..3e0a3c206e7 100644
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -119,7 +119,9 @@ abstract class QBMapper {
 
 		$qb->execute();
 
-		$entity->setId((int) $qb->getLastInsertId());
+		if($entity->getId() === null) {
+			$entity->setId((int)$qb->getLastInsertId());
+		}
 
 		return $entity;
 	}