Make sure we really don't try to receive the last id if we don't have…

… a sequence name. See https://bugs.php.net/bug.php?id=72759.
horde · Aug 30, 2016 · 64c5ff7 · 64c5ff7
1 parent 38fb79f
commit 64c5ff7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php
@@ -144,9 +144,9 @@ public function insert($sql, $arg1 = null, $arg2 = null, $pk = null,
         }
 
         // Otherwise, insert then grab last_insert_id.
-        if ($insertId = parent::insert($sql, $arg1, $arg2, $pk, $idValue, $sequenceName)) {
-            $this->resetPkSequence($table, $pk, $sequenceName);
-            return $insertId;
+        $this->execute($sql, $arg1, $arg2);
+        if ($idValue) {
+            return $idValue;
         }
 
         // If a pk is given, fallback to default sequence name.

diff --git a/framework/Db/package.xml b/framework/Db/package.xml
@@ -34,7 +34,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [jan] Fix failing transactions if retrieving last INSERT ID from PostgreSQL fails on PHP 7.2.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -942,7 +942,7 @@
    <date>2016-07-02</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [jan] Fix failing transactions if retrieving last INSERT ID from PostgreSQL fails on PHP 7.2.
    </notes>
   </release>
  </changelog>