From e8f17c13a7839717a9bc029ab57d7f6598b52b97 Mon Sep 17 00:00:00 2001 From: Maxime Rault Date: Tue, 10 May 2016 15:49:47 +0200 Subject: [PATCH] Change "name" setting to "driverName" because of a conflict with standard Laravel setting not documented --- README.md | 2 +- src/Connectors/ODBCConnector.php | 2 +- src/config/config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07115f7..8e84a23 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Simply add this code at the end of your ``app/config/database.php`` file: 'ibmi' => [ 'driver' => 'odbc' / 'ibm', - 'name' => '{IBM i Access ODBC Driver}' / '{iSeries Access ODBC Driver}', + 'driverName' => '{IBM i Access ODBC Driver}' / '{iSeries Access ODBC Driver}', // General settings 'host' => 'server', 'username' => '', diff --git a/src/Connectors/ODBCConnector.php b/src/Connectors/ODBCConnector.php index 35d1078..3e535ac 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=$name;" + . "DRIVER=$driverName;" . "SYSTEM=$host;" . "UserID=$username;" . "Password=$password;" diff --git a/src/config/config.php b/src/config/config.php index 32d54c7..5c00d5f 100644 --- a/src/config/config.php +++ b/src/config/config.php @@ -62,7 +62,7 @@ return [ 'ibmi' => [ 'driver' => 'odbc' / 'ibm', - 'name' => '{IBM i Access ODBC Driver}' / '{iSeries Access ODBC Driver}', + 'driverName' => '{IBM i Access ODBC Driver}' / '{iSeries Access ODBC Driver}', // General settings 'host' => 'server', 'username' => '',