Skip to content

Commit b20f121

Browse files
committed
feat: mark MS SQL protocols like named pipe as unsupported, advise the user to change to TCP/IP
Refs #2149
1 parent 93bf989 commit b20f121

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

source/dbconnection.pas

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,11 +1517,11 @@ function TConnectionParameters.NetTypeName(LongFormat: Boolean): String;
15171517
ntMySQL_SSHtunnel: Result := PrefixMysql+' (SSH tunnel)';
15181518
ntMySQL_ProxySQLAdmin: Result := PrefixProxysql+' (Experimental)';
15191519
ntMySQL_RDS: Result := 'MySQL on RDS';
1520-
ntMSSQL_NamedPipe: Result := PrefixMssql+' (named pipe)';
1520+
ntMSSQL_NamedPipe: Result := PrefixMssql+' (named pipe, unsuppported)';
15211521
ntMSSQL_TCPIP: Result := PrefixMssql+' (TCP/IP)';
1522-
ntMSSQL_SPX: Result := PrefixMssql+' (SPX/IPX)';
1523-
ntMSSQL_VINES: Result := PrefixMssql+' (Banyan VINES)';
1524-
ntMSSQL_RPC: Result := PrefixMssql+' (Windows RPC)';
1522+
ntMSSQL_SPX: Result := PrefixMssql+' (SPX/IPX, unsuppported)';
1523+
ntMSSQL_VINES: Result := PrefixMssql+' (Banyan VINES, unsuppported)';
1524+
ntMSSQL_RPC: Result := PrefixMssql+' (Windows RPC, unsuppported)';
15251525
ntPgSQL_TCPIP: Result := PrefixPostgres+' (TCP/IP)';
15261526
ntPgSQL_SSHtunnel: Result := PrefixPostgres+' (SSH tunnel)';
15271527
ntSQLite: Result := PrefixSqlite;
@@ -1785,12 +1785,11 @@ function TConnectionParameters.DefaultLibrary: String;
17851785
begin
17861786
Result := '';
17871787
case NetTypeGroup of
1788-
ngMySQL, ngPgSQL, ngSQLite: begin
1788+
ngMySQL, ngMSSQL, ngPgSQL, ngSQLite: begin
17891789
AllLibs := GetLibraries;
17901790
if AllLibs.Count > 0 then
17911791
Result := AllLibs[0];
17921792
end;
1793-
ngMSSQL: Result := 'MSOLEDBSQL'; // Prefer MSOLEDBSQL provider on newer systems
17941793
ngInterbase: begin
17951794
if IsInterbase then
17961795
Result := IfThen(GetExecutableBits=64, 'ibclient64.', 'gds32.') + SharedSuffix
@@ -2590,6 +2589,12 @@ procedure TSqlSrvConnection.SetActive(Value: Boolean);
25902589
FinalPort: Integer;
25912590
begin
25922591
if Value then begin
2592+
if Parameters.NetType <> ntMSSQL_TCPIP then begin
2593+
raise EDbError.Create('No longer supported network type: '+Parameters.NetTypeName(True),
2594+
0,
2595+
'Please select the TCP/IP type for MS SQL instead');
2596+
end;
2597+
25932598
DoBeforeConnect;
25942599
FinalHost := Parameters.Hostname;
25952600
FinalPort := Parameters.Port;

0 commit comments

Comments
 (0)