diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 513267f26610..413c0a4726ee 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -336,7 +336,9 @@ abstract class BaseConnection implements ConnectionInterface
     public function __construct(array $params)
     {
         foreach ($params as $key => $value) {
-            $this->{$key} = $value;
+            if (property_exists($this, $key)) {
+                $this->{$key} = $value;
+            }
         }
 
         $queryClass = str_replace('Connection', 'Query', static::class);
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index aec24dad3a46..7b58bdb237d8 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -42,6 +42,11 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '"';
 
+    protected $connect_timeout;
+    protected $options;
+    protected $sslmode;
+    protected $service;
+
     /**
      * Connect to the database.
      *
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index c9d03e7638d6..2d95b496aab8 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -19,6 +19,14 @@
 class MockConnection extends BaseConnection
 {
     protected $returnValues = [];
+
+    /**
+     * Database schema for Postgre and SQLSRV
+     *
+     * @var string
+     */
+    protected $schema;
+
     public $database;
     public $lastQuery;