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

[5.2] Added sqlserver odbc connection support #13298

Merged
merged 7 commits into from
Apr 27, 2016
Merged

[5.2] Added sqlserver odbc connection support #13298

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2adf5c
added sqlserver odbc connection support
eddy8 Apr 22, 2016
e0a2499
fixed code style
eddy8 Apr 22, 2016
c69a783
Change config param get method
eddy8 Apr 23, 2016
0073655
Change config param get method
eddy8 Apr 23, 2016
b3a9b21
change config name
eddy8 Apr 23, 2016
a812354
Added driver config param check.
eddy8 Apr 25, 2016
3dcd37a
change db driver check
eddy8 Apr 27, 2016
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
21 changes: 21 additions & 0 deletions src/Illuminate/Database/Connectors/SqlServerConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,32 @@ protected function getDsn(array $config)
// need to establish the PDO connections and return them back for use.
if (in_array('dblib', $this->getAvailableDrivers())) {
return $this->getDblibDsn($config);
} elseif (in_array('odbc', $this->getAvailableDrivers())) {
if (isset($config['odbc']) && $config['odbc'] === true) {
return $this->getOdbcDsn($config);
} else {
return $this->getSqlSrvDsn($config);
Copy link
Member

Choose a reason for hiding this comment

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

why this extra case?

Copy link
Member

Choose a reason for hiding this comment

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

No need for the isset check either. It's guaranteed to be there.

Copy link
Member

Choose a reason for hiding this comment

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

Just do:

        if (in_array('dblib', $this->getAvailableDrivers())) {
            return $this->getDblibDsn($config);
        } elseif (in_array('odbc', $this->getAvailableDrivers()) && $config['driver'] === 'odbc') {
            return $this->getOdbcDsn($config);
        } else {
            return $this->getSqlSrvDsn($config);
        }

Copy link
Member

Choose a reason for hiding this comment

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

When is $config['driver'] === 'odbc' ever true?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

DB_CONNECTION is 'sqlsrv' and driver is 'odbc'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What if odbc is an availble driver but they want to use the sqlsrv string? By taylorotwell.

}
} else {
return $this->getSqlSrvDsn($config);
}
}

/**
* Get the DSN string for a ODBC connection.
*
* @param array $config
* @return string
*/
protected function getOdbcDsn(array $config)
{
if (isset($config['odbc_datasource_name'])) {
return 'odbc:'.$config['odbc_datasource_name'];
} else {
return '';
}
}

/**
* Get the DSN string for a DbLib connection.
*
Expand Down