From 00a2e82ca8691de1767e0102cea5e42203435599 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Tue, 2 Jan 2018 15:26:33 -0800 Subject: [PATCH] Changed connection order to ODBC drivers --- source/shared/core_conn.cpp | 10 +++++----- source/shared/core_sqlsrv.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/shared/core_conn.cpp b/source/shared/core_conn.cpp index 6f9b0710..ff4139fb 100644 --- a/source/shared/core_conn.cpp +++ b/source/shared/core_conn.cpp @@ -50,7 +50,7 @@ const char* PROCESSOR_ARCH[] = { "x86", "x64", "ia64" }; // ODBC driver names. // the order of this list should match the order of DRIVER_VERSION enum -std::vector 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 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 const char CONNECTION_STRING_DEFAULT_OPTIONS[] = "Mars_Connection={Yes};"; @@ -183,11 +183,11 @@ 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 DRIVER_VERSION odbc_version = ODBC_DRIVER_UNKNOWN; - if( core_search_odbc_driver_unix( ODBC_DRIVER_13 ) ) { - odbc_version = ODBC_DRIVER_13; - } - else if ( core_search_odbc_driver_unix( ODBC_DRIVER_17 ) ) { + if( core_search_odbc_driver_unix( 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() ) { diff --git a/source/shared/core_sqlsrv.h b/source/shared/core_sqlsrv.h index 2e2cc371..9d5d6770 100644 --- a/source/shared/core_sqlsrv.h +++ b/source/shared/core_sqlsrv.h @@ -1043,10 +1043,10 @@ enum SERVER_VERSION { enum DRIVER_VERSION { ODBC_DRIVER_UNKNOWN = -1, FIRST = 0, - ODBC_DRIVER_13 = FIRST, - ODBC_DRIVER_11 = 1, - ODBC_DRIVER_17 = 2, - LAST = ODBC_DRIVER_17 + ODBC_DRIVER_17 = FIRST, + ODBC_DRIVER_13 = 1, + ODBC_DRIVER_11 = 2, + LAST = ODBC_DRIVER_11 }; // forward decl