Attachment 246206 Details for Bug 274971 – update patch

[patch] update patch

php82-pear-DB-1.11.0_1,1.diff (text/plain), 1.62 KB, created by Krzysztof on 2023-11-08 19:58:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2023-11-08 19:58:19 UTC

Size: 1.62 KB

patch

obsolete

>diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
>index f9716a62b72..b0195532915 100644
>--- a/databases/pear-DB/Makefile
>+++ b/databases/pear-DB/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	DB
> PORTVERSION=	1.11.0
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	databases www pear
> 
>diff --git a/databases/pear-DB/files/patch-DB_pgsql.php b/databases/pear-DB/files/patch-DB_pgsql.php
>new file mode 100644
>index 00000000000..bc20077c955
>--- /dev/null
>+++ b/databases/pear-DB/files/patch-DB_pgsql.php
>@@ -0,0 +1,26 @@
>+--- DB/pgsql.php.orig	2021-08-11 00:23:52 UTC
>++++ DB/pgsql.php
>+@@ -356,12 +356,12 @@ class DB_pgsql extends DB_common
>+         } elseif (preg_match('/^\s*\(*\s*(SELECT|EXPLAIN|FETCH|SHOW|WITH)\s/si',
>+                              $query))
>+         {
>+-            $this->row[(int)$result] = 0; // reset the row counter.
>++            $this->row[pg_num_rows($result)] = 0; // reset the row counter.
>+             $numrows = $this->numRows($result);
>+             if (is_object($numrows)) {
>+                 return $numrows;
>+             }
>+-            $this->_num_rows[(int)$result] = $numrows;
>++            $this->_num_rows[pg_num_rows($result)] = $numrows;
>+             $this->affected = 0;
>+             return $result;
>+         } else {
>+@@ -412,7 +412,7 @@ class DB_pgsql extends DB_common
>+      */
>+     function fetchInto($result, &$arr, $fetchmode, $rownum = null)
>+     {
>+-        $result_int = (int)$result;
>++        $result_int = pg_num_rows($result);
>+         $rownum = ($rownum !== null) ? $rownum : $this->row[$result_int];
>+         if ($rownum >= $this->_num_rows[$result_int]) {
>+             return null;

Actions: View | Diff

Attachments on bug 274971: 246205 | 246206