From f7531560195b16ee2369c4d642902628fffd8ebc Mon Sep 17 00:00:00 2001 From: Maxime Rault Date: Wed, 4 May 2016 09:17:24 +0200 Subject: [PATCH] Add parameter for ODBC IBM i driver name. --- src/Connectors/ODBCConnector.php | 2 +- src/DB2ServiceProvider.php | 4 ++-- src/config/config.php | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Connectors/ODBCConnector.php b/src/Connectors/ODBCConnector.php index a44d638..35d1078 100644 --- a/src/Connectors/ODBCConnector.php +++ b/src/Connectors/ODBCConnector.php @@ -30,7 +30,7 @@ class ODBCConnector extends Connector implements ConnectorInterface $dsn = "odbc:" // General settings - . "DRIVER={iSeries Access ODBC Driver};" + . "DRIVER=$name;" . "SYSTEM=$host;" . "UserID=$username;" . "Password=$password;" diff --git a/src/DB2ServiceProvider.php b/src/DB2ServiceProvider.php index e5e385f..8a6cd18 100644 --- a/src/DB2ServiceProvider.php +++ b/src/DB2ServiceProvider.php @@ -45,7 +45,7 @@ class DB2ServiceProvider extends ServiceProvider { { //Only use configurations that feature a "odbc" or "ibm" driver - if(!isset($config['driver']) || !in_array($config['driver'], ['odbc', 'ibm']) ) + if(!isset($config['type']) || !in_array($config['type'], ['odbc', 'ibm']) ) { continue; } @@ -53,7 +53,7 @@ class DB2ServiceProvider extends ServiceProvider { //Create a connector $this->app['db']->extend($conn, function($config) { - switch ($config['driver']) { + switch ($config['type']) { case 'odbc': $connector = new ODBCConnector(); break; diff --git a/src/config/config.php b/src/config/config.php index b3197f8..1743053 100644 --- a/src/config/config.php +++ b/src/config/config.php @@ -56,13 +56,13 @@ PDO::CASE_NATURAL */ - return [ 'connections' => [ 'ibmi' => [ - 'driver' => 'odbc' / 'ibm', + 'type' => 'odbc' / 'ibm', + 'name' => '{IBM i Access ODBC Driver}' / '{iSeries Access ODBC Driver}', // General settings 'host' => 'server', 'username' => '', @@ -131,6 +131,17 @@ return [ PDO::ATTR_CASE => PDO::CASE_LOWER, PDO::ATTR_EMULATE_PREPARES => false, PDO::ATTR_PERSISTENT => false + ], + 'toolkit' => [ + 'XMLServiceLib' => 'XMLSERVICE', + 'debug' => false, + 'debugLogFile' => storage_path() . '/logs/toolkit.log', + 'InternalKey' => '/tmp/' . 'Toolkit_' . app()->environment() . '_' . rand(1, 10), + 'stateless' => false, + 'plugSize' => '4K', + 'ccsidBefore' => "819/1147", + 'ccsidAfter' => "1147/819", + 'useHex' => true ] ],