fix

Author: dg

src/Dibi/Drivers/PostgreDriver.php

@@ -11,6 +11,7 @@
 
 use Dibi;
 use Dibi\Helpers;
+use PgSql;
 
 
 /**
@@ -29,7 +30,7 @@ class PostgreDriver implements Dibi\Driver
 {
 	use Dibi\Strict;
 
-	/** @var resource */
+	/** @var resource|PgSql\Connection */
 	private $connection;
 
 	/** @var int|null  Affected rows */
@@ -74,7 +75,7 @@ public function __construct(array $config)
 			restore_error_handler();
 		}
 
-		if (!is_resource($this->connection)) {
+		if (!is_resource($this->connection) && !$this->connection instanceof PgSql\Connection) {
 			throw new Dibi\DriverException($error ?: 'Connecting error.');
 		}
 
@@ -120,7 +121,7 @@ public function query(string $sql): ?Dibi\ResultDriver
 		if ($res === false) {
 			throw static::createException(pg_last_error($this->connection), null, $sql);
 
-		} elseif (is_resource($res)) {
+		} elseif (is_resource($res) || $res instanceof PgSql\Result) {
 			$this->affectedRows = Helpers::false2Null(pg_affected_rows($res));
 			if (pg_num_fields($res)) {
 				return $this->createResultDriver($res);
@@ -227,7 +228,9 @@ public function inTransaction(): bool
 	 */
 	public function getResource()
 	{
-		return is_resource($this->connection) ? $this->connection : null;
+		return is_resource($this->connection) || $this->connection instanceof PgSql\Connection
+			? $this->connection
+			: null;
 	}
 
 
@@ -258,7 +261,7 @@ public function createResultDriver($resource): PostgreResult
 	 */
 	public function escapeText(string $value): string
 	{
-		if (!is_resource($this->connection)) {
+		if (!$this->getResource()) {
 			throw new Dibi\Exception('Lost connection to server.');
 		}
 		return "'" . pg_escape_string($this->connection, $value) . "'";
@@ -267,7 +270,7 @@ public function escapeText(string $value): string
 
 	public function escapeBinary(string $value): string
 	{
-		if (!is_resource($this->connection)) {
+		if (!$this->getResource()) {
 			throw new Dibi\Exception('Lost connection to server.');
 		}
 		return "'" . pg_escape_bytea($this->connection, $value) . "'";

src/Dibi/Drivers/PostgreResult.php

@@ -11,6 +11,7 @@
 
 use Dibi;
 use Dibi\Helpers;
+use PgSql;
 
 
 /**
@@ -20,15 +21,15 @@ class PostgreResult implements Dibi\ResultDriver
 {
 	use Dibi\Strict;
 
-	/** @var resource */
+	/** @var resource|PgSql\Result */
 	private $resultSet;
 
 	/** @var bool */
 	private $autoFree = true;
 
 
 	/**
-	 * @param  resource  $resultSet
+	 * @param  resource|PgSql\Result  $resultSet
 	 */
 	public function __construct($resultSet)
 	{
@@ -108,12 +109,14 @@ public function getResultColumns(): array
 
 	/**
 	 * Returns the result set resource.
-	 * @return resource|null
+	 * @return resource|PgSql\Result|null
 	 */
 	public function getResultResource()
 	{
 		$this->autoFree = false;
-		return is_resource($this->resultSet) ? $this->resultSet : null;
+		return is_resource($this->resultSet) || $this->resultSet instanceof PgSql\Result
+			? $this->resultSet
+			: null;
 	}