Skip to content

odbc: support for php 8.4 changes #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DanCld wants to merge 8 commits into
base: trunk
Choose a base branch
from
Draft

odbc: support for php 8.4 changes #47

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
afa6661
Fix: PHP 8.1 pgsql change of return values
DanCld Mar 21, 2025
647cdab
Fixing a bug in tableInfo() method
DanCld Mar 25, 2025
44e9321
PR change as per comments received
DanCld Apr 30, 2025
83497f4
Errant space removed as per comment
DanCld Apr 30, 2025
36a5618
Added a catch-all statement to _resultId(...)
DanCld Apr 30, 2025
e32dc32
Semicolon added as per comment
DanCld May 1, 2025
a58bca0
Merge branch 'pear:trunk' into trunk
DanCld May 2, 2025
c500dc9
possible odbc fix for php 8.4
DanCld May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DB/odbc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ function connect($dsn, $persistent = false)
$dsn['cursor']);
}

if (!is_resource($this->connection)) {
if (!is_resource($this->connection) && !is_a($result, 'Odbc\Connection')) {
Copy link
Copy Markdown
Contributor

@MarkMaldaba MarkMaldaba Apr 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be $this->connection rather than $result.

return $this->raiseError(DB_ERROR_CONNECT_FAILED,
null, null, null,
$this->errorNative());
Expand Down Expand Up @@ -366,7 +366,7 @@ function fetchInto($result, &$arr, $fetchmode, $rownum = null)
*/
function freeResult($result)
{
return is_resource($result) ? odbc_free_result($result) : false;
return (is_resource($result) || is_a($result, 'Odbc\Result')) ? odbc_free_result($result) : false;
}

// }}}
Expand Down Expand Up @@ -691,7 +691,7 @@ function odbcRaiseError($errno = null)
*/
function errorNative()
{
if (!is_resource($this->connection)) {
if (!is_resource($this->connection) && !is_a($result, 'Odbc\Connection')) {
Copy link
Copy Markdown
Contributor

@MarkMaldaba MarkMaldaba Apr 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be $this->connection rather than $result.

return @odbc_error() . ' ' . @odbc_errormsg();
}
return @odbc_error($this->connection) . ' ' . @odbc_errormsg($this->connection);
Expand Down Expand Up @@ -745,7 +745,7 @@ function tableInfo($result, $mode = null)
$got_string = false;
}

if (!is_resource($id)) {
if (!is_resource($id) && !is_a($result, 'Odbc\Result')) {
Copy link
Copy Markdown
Contributor

@MarkMaldaba MarkMaldaba Apr 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be $id rather than $result.

return $this->odbcRaiseError(DB_ERROR_NEED_MORE_DATA);
}

Expand Down