Fixed Database::lastInsertId call for PostgreSQL

src/B8Framework/Database.php

@@ -10,6 +10,20 @@ class Database extends \PDO
     protected static $details     = [];
     protected static $lastUsed    = ['read' => null, 'write' => null];
 
+    /**
+     * @param string $table
+     *
+     * @return string
+     */
+    public function lastInsertIdExtended($table = null)
+    {
+        if ($table && $this->getAttribute(self::ATTR_DRIVER_NAME) == 'pgsql') {
+            return parent::lastInsertId($table . '_id_seq');
+        }
+
+        return parent::lastInsertId();
+    }
+
     protected static function init()
     {
         $config   = Config::getInstance();

src/B8Framework/Store.php

@@ -251,26 +251,28 @@ abstract class Store
 
     public function saveByInsert(Model $obj, $saveAllColumns = false)
     {
-        $rtn = null;
-        $data = $obj->getDataArray();
+        $rtn      = null;
+        $data     = $obj->getDataArray();
         $modified = ($saveAllColumns) ? array_keys($data) : $obj->getModified();
 
         $cols    = [];
         $values  = [];
         $qParams = [];
         foreach ($modified as $key) {
-            $cols[] = $key;
-            $values[] = ':' . $key;
+            $cols[]              = $key;
+            $values[]            = ':' . $key;
             $qParams[':' . $key] = $data[$key];
         }
 
         if (count($cols)) {
-            $qs = 'INSERT INTO {{' . $this->tableName . '}} (' . implode(', ', $cols) . ') VALUES (' . implode(', ',
-                    $values) . ')';
+            $qs = 'INSERT INTO {{' . $this->tableName . '}} (' . implode(', ', $cols) . ') VALUES (' . implode(', ', $values) . ')';
             $q = Database::getConnection('write')->prepareCommon($qs);
 
             if ($q->execute($qParams)) {
-                $id = !empty($data[$this->primaryKey]) ? $data[$this->primaryKey] : Database::getConnection('write')->lastInsertId();
+                $id = !empty($data[$this->primaryKey])
+                    ? $data[$this->primaryKey]
+                    : Database::getConnection('write')->lastInsertIdExtended($obj->getTableName());
+
                 $rtn = $this->getByPrimaryKey($id, 'write');
             }
         }

src/PHPCensor/View/exception.phtml

@@ -9,7 +9,7 @@
     <div class="box-body">
         <?= $exception->getMessage(); ?><br />
         File: <?= $exception->getFile(); ?><br />
-        Line: <?= $exception->getLine(); ?><br />
+        Line: <?= $exception->getLine(); ?>
         <pre>
             <?= $exception->getTraceAsString(); ?>
         </pre>