Changed connection order to ODBC drivers
This commit is contained in:
parent
870c23f7a7
commit
00a2e82ca8
|
@ -50,7 +50,7 @@ const char* PROCESSOR_ARCH[] = { "x86", "x64", "ia64" };
|
||||||
|
|
||||||
// ODBC driver names.
|
// ODBC driver names.
|
||||||
// the order of this list should match the order of DRIVER_VERSION enum
|
// the order of this list should match the order of DRIVER_VERSION enum
|
||||||
std::vector<std::string> CONNECTION_STRING_DRIVER_NAME{ "Driver={ODBC Driver 13 for SQL Server};", "Driver={ODBC Driver 11 for SQL Server};", "Driver={ODBC Driver 17 for SQL Server};" };
|
std::vector<std::string> CONNECTION_STRING_DRIVER_NAME{ "Driver={ODBC Driver 17 for SQL Server};", "Driver={ODBC Driver 13 for SQL Server};", "Driver={ODBC Driver 11 for SQL Server};" };
|
||||||
|
|
||||||
// default options if only the server is specified
|
// default options if only the server is specified
|
||||||
const char CONNECTION_STRING_DEFAULT_OPTIONS[] = "Mars_Connection={Yes};";
|
const char CONNECTION_STRING_DEFAULT_OPTIONS[] = "Mars_Connection={Yes};";
|
||||||
|
@ -183,12 +183,12 @@ sqlsrv_conn* core_sqlsrv_connect( _In_ sqlsrv_context& henv_cp, _In_ sqlsrv_cont
|
||||||
// https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#microsoft-odbc-driver-11-for-sql-server-on-linux
|
// https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#microsoft-odbc-driver-11-for-sql-server-on-linux
|
||||||
|
|
||||||
DRIVER_VERSION odbc_version = ODBC_DRIVER_UNKNOWN;
|
DRIVER_VERSION odbc_version = ODBC_DRIVER_UNKNOWN;
|
||||||
if( core_search_odbc_driver_unix( ODBC_DRIVER_13 ) ) {
|
if( core_search_odbc_driver_unix( ODBC_DRIVER_17 ) ) {
|
||||||
odbc_version = ODBC_DRIVER_13;
|
|
||||||
}
|
|
||||||
else if ( core_search_odbc_driver_unix( ODBC_DRIVER_17 ) ) {
|
|
||||||
odbc_version = ODBC_DRIVER_17;
|
odbc_version = ODBC_DRIVER_17;
|
||||||
}
|
}
|
||||||
|
else if ( core_search_odbc_driver_unix( ODBC_DRIVER_13 ) ) {
|
||||||
|
odbc_version = ODBC_DRIVER_13;
|
||||||
|
}
|
||||||
|
|
||||||
CHECK_CUSTOM_ERROR( odbc_version == ODBC_DRIVER_UNKNOWN, conn, SQLSRV_ERROR_DRIVER_NOT_INSTALLED, get_processor_arch() ) {
|
CHECK_CUSTOM_ERROR( odbc_version == ODBC_DRIVER_UNKNOWN, conn, SQLSRV_ERROR_DRIVER_NOT_INSTALLED, get_processor_arch() ) {
|
||||||
throw core::CoreException();
|
throw core::CoreException();
|
||||||
|
|
|
@ -1043,10 +1043,10 @@ enum SERVER_VERSION {
|
||||||
enum DRIVER_VERSION {
|
enum DRIVER_VERSION {
|
||||||
ODBC_DRIVER_UNKNOWN = -1,
|
ODBC_DRIVER_UNKNOWN = -1,
|
||||||
FIRST = 0,
|
FIRST = 0,
|
||||||
ODBC_DRIVER_13 = FIRST,
|
ODBC_DRIVER_17 = FIRST,
|
||||||
ODBC_DRIVER_11 = 1,
|
ODBC_DRIVER_13 = 1,
|
||||||
ODBC_DRIVER_17 = 2,
|
ODBC_DRIVER_11 = 2,
|
||||||
LAST = ODBC_DRIVER_17
|
LAST = ODBC_DRIVER_11
|
||||||
};
|
};
|
||||||
|
|
||||||
// forward decl
|
// forward decl
|
||||||
|
|
Loading…
Reference in a new issue