Skip to content
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

PHP 8.4 support by adding Odbc\Connection handling #216

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

PHP 8.4 support by adding Odbc\Connection handling #216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86d3d3f
Enable SQLite for Unit Testing and Improve ODBC Compatibility
jonkerw85 Mar 13, 2025
4eb8e3c
Reverted tests to commit 15fb93d
jonkerw85 Mar 18, 2025
c51a780
Reverted UNITTEST.md to commit 15fb93d
jonkerw85 Mar 18, 2025
be0e5b1
feat: Add support for Odbc\Connection in database resource parameter
jonkerw85 Mar 18, 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
6 changes: 3 additions & 3 deletions ToolkitApi/Toolkit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ protected function isDebug()
/**
* if passing an existing resource and naming, don't need the other params.
*
* @param string|resource|PDO $databaseNameOrResource
* @param string|resource|PDO|Odbc\Connection $databaseNameOrResource
* @param string $userOrI5NamingFlag 0 = DB2_I5_NAMING_OFF or 1 = DB2_I5_NAMING_ON
* @param string $password
* @param string $transportType (http, ibm_db2, odbc, ssh, local)
Expand All @@ -158,7 +158,7 @@ public function __construct($databaseNameOrResource, $userOrI5NamingFlag = '0',
}

// stop any types that are not valid for first parameter. Invalid values may cause toolkit to try to create another database connection.
if (!is_string($databaseNameOrResource) && !is_resource($databaseNameOrResource) && ((!is_object($databaseNameOrResource) || (is_object($databaseNameOrResource) && get_class($databaseNameOrResource) !== PDO::class)))) {
if (!is_string($databaseNameOrResource) && !is_resource($databaseNameOrResource) && ((!is_object($databaseNameOrResource) || (is_object($databaseNameOrResource) && !in_array(get_class($databaseNameOrResource), [PDO::class, \Odbc\Connection::class], true))))) {

// initialize generic message
$this->error = "\nFailed to connect. databaseNameOrResource " . var_export($databaseNameOrResource, true) . " not valid.";
Expand Down Expand Up @@ -224,7 +224,7 @@ public function __construct($databaseNameOrResource, $userOrI5NamingFlag = '0',
if ($this->isDebug()) {
$this->debugLog("Re-using existing db connection with schema separator: $schemaSep");
}
} elseif ($transportType === 'odbc' && $isResource) {
} elseif ($transportType === 'odbc' && ($isResource || $databaseNameOrResource instanceof \Odbc\Connection)) {
$conn = $databaseNameOrResource;
$this->_i5NamingFlag = $userOrI5NamingFlag;
$schemaSep = ($this->_i5NamingFlag) ? '/' : '.';
Expand Down