Change "name" setting to "driverName" because of a conflict with stan…

…dard Laravel setting not documented
cooperl22 · May 10, 2016 · e8f17c1 · e8f17c1
1 parent 0e83f37
commit e8f17c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -30,7 +30,7 @@ protected function getDsn(array $config) {
 
         $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
@@ -62,7 +62,7 @@
 
         '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'             => '',