[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r8190 - in sandbox/adsk/main/Providers/GenericRdbms/Src: SQLServerSpatial/Fdo
From:       svn_fdo () osgeo ! org
Date:       2022-11-24 1:18:57
Message-ID: 20221124011858.36E321137C4 () trac ! osgeo ! org
[Download RAW message or body]

Author: christinebao
Date: 2022-11-23 17:18:56 -0800 (Wed, 23 Nov 2022)
New Revision: 8190

Modified:
   sandbox/adsk/main/Providers/GenericRdbms/Src/SQLServerSpatial/Fdo/FdoRdbmsSqlServerConnection.cpp
  sandbox/adsk/main/Providers/GenericRdbms/Src/UnitTest/SQLServerSpatial/SqlServerConnectionUtil.cpp
 Log:
Support ODBC Driver for SQL Server 17 or later.

Modified: sandbox/adsk/main/Providers/GenericRdbms/Src/SQLServerSpatial/Fdo/FdoRdbmsSqlServerConnection.cpp
 ===================================================================
--- sandbox/adsk/main/Providers/GenericRdbms/Src/SQLServerSpatial/Fdo/FdoRdbmsSqlServerConnection.cpp	2022-11-15 \
                06:18:09 UTC (rev 8189)
+++ sandbox/adsk/main/Providers/GenericRdbms/Src/SQLServerSpatial/Fdo/FdoRdbmsSqlServerConnection.cpp	2022-11-24 \
01:18:56 UTC (rev 8190) @@ -550,9 +550,9 @@
         {
             // let's detect the client!
             wchar_t tmpBuff[3];
-            int clientNo = 13;
+            int clientNo = 17;
             bool found = false;
-            while(clientNo < 15)
+            while(clientNo < 35)
             {
                 _itow(clientNo, tmpBuff, 10);
                 std::wstring lName(L"MSODBCSQL");
@@ -569,12 +569,12 @@
             }
 
             if (!found)
-                throw FdoConnectionException::Create(L"Please install 'ODBC Driver \
for SQL Server 13' or upper to be able to use the provider"); +                throw \
FdoConnectionException::Create(L"Please install 'ODBC Driver for SQL Server 17' or \
upper to be able to use the provider");  
             newCs = L"DRIVER={ODBC Driver ";
             newCs += tmpBuff;
             newCs += L" for SQL Server}";
-            newCs += L";MARS_Connection=yes;SERVER=";
+            newCs += L";MARS_Connection=yes;TrustServerCertificate=yes;SERVER=";
 
             newCs += dataSource;
 			FdoStringP user = dict->GetProperty(FDO_RDBMS_CONNECTION_USERNAME);

Modified: sandbox/adsk/main/Providers/GenericRdbms/Src/UnitTest/SQLServerSpatial/SqlServerConnectionUtil.cpp
 ===================================================================
--- sandbox/adsk/main/Providers/GenericRdbms/Src/UnitTest/SQLServerSpatial/SqlServerConnectionUtil.cpp	2022-11-15 \
                06:18:09 UTC (rev 8189)
+++ sandbox/adsk/main/Providers/GenericRdbms/Src/UnitTest/SQLServerSpatial/SqlServerConnectionUtil.cpp	2022-11-24 \
01:18:56 UTC (rev 8190) @@ -297,9 +297,9 @@
 {
     FdoStringP retVal;
     wchar_t tmpBuff[3];
-    int clientNo = 13;
+    int clientNo = 17;
     bool found = false;
-    while(clientNo < 15)
+    while(clientNo < 35)
     {
         _itow(clientNo, tmpBuff, 10);
         std::wstring lName(L"MSODBCSQL");
@@ -316,7 +316,7 @@
     }
 
     if (!found)
-        throw FdoConnectionException::Create(L"Please install 'ODBC Driver for SQL \
Server 13' or upper to be able to use the provider"); +        throw \
FdoConnectionException::Create(L"Please install 'ODBC Driver for SQL Server 17' or \
upper to be able to use the provider");  
     retVal = L"ODBC Driver ";
     retVal += tmpBuff;

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]