Modify insert to retrun the generated value to replace pdo::lastInsertId(). This still needs a little improvement to perhaps identify the autoincrement field better. It also needs upstream code to avoid the pdo error.

1 files changed, 43 insertions, 0 deletions

diff --git a/src/FirebirdConnection.php b/src/FirebirdConnection.php
index 7186d00..50080b4 100755
--- a/src/FirebirdConnection.php
+++ b/src/FirebirdConnection.php
@@ -13,6 +13,14 @@ use Xgrz\Firebird\Schema\Grammars\FirebirdGrammar as FirebirdSchemaGrammar;
 class FirebirdConnection extends DatabaseConnection
 {
     /**
+     * The last inserted ID generated by the server.
+	 * RETURNED by the insert statement
+     *
+     * @var string|int|null
+     */
+    protected $lastInsertId;
+
+    /**
      * Get the default query grammar instance.
      *
      * @return \Illuminate\Database\Query\Grammars\Grammar
@@ -69,6 +77,41 @@ class FirebirdConnection extends DatabaseConnection
     }
 
     /**
+     * Run an insert statement against the database.
+     *
+     * @param  string  $query
+     * @param  array  $bindings
+     * @param  string|null  $sequence
+     * @return bool
+     */
+    public function insert($query, $bindings = [], $sequence = null)
+    {
+        return $this->run($query, $bindings, function ($query, $bindings) use ($sequence) {
+            if ($this->pretending()) {
+                return true;
+            }
+			
+			$statement = $this->getPdo()->prepare($query);
+
+            $this->bindValues($statement, $this->prepareBindings($bindings));
+
+            $this->recordsHaveBeenModified();
+
+            $result = $statement->execute();
+
+			// Fetch the RETURNING clause result to get the actual ID used
+			if ($result) {
+				$row = $statement->fetch(\PDO::FETCH_ASSOC);
+				if ($row) {
+					// Get the first (and typically only) returned value
+					$this->lastInsertId = reset($row);
+				}
+			}
+			
+           return $result;
+        });
+    }
+    /**
      * Execute a stored procedure.
      *
      * @param  string  $procedure