opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix displaying "20.14" server version on SQL Server 2014. Try to get more exact version with SELECT SERVERPROPERTY('ProductVersion') on 2008 and newer servers. See http://msdn.microsoft.com/de-de/library/ms174396.aspx .

Browse Source
This commit is contained in:
Ansgar Becker
2014-09-13 11:15:24 +00:00
parent f56764522d
commit ce6d525d35
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/dbconnection.pas
View File

@ -1743,6 +1743,13 @@ begin
rx.Expression := '^([^\r\n]+)'; rx.Expression := '^([^\r\n]+)';
if rx.Exec(FServerVersionUntouched) then if rx.Exec(FServerVersionUntouched) then
FServerVersionUntouched := rx.Match[1]; FServerVersionUntouched := rx.Match[1];
try
// Try to get more exact server version to avoid displaying "20.14" in some cases
FServerVersionUntouched := GetVar('SELECT SERVERPROPERTY('+EscapeString('ProductVersion')+')');
except
// Above query only works on SQL Server 2008 and newer
// Keep value from SELECT @@VERSION on older servers
end;
rx.Free; rx.Free;
FRealHostname := Parameters.Hostname; FRealHostname := Parameters.Hostname;
@ -2866,6 +2873,12 @@ begin
v2 := rx.Match[2]; v2 := rx.Match[2];
Result := StrToIntDef(v1, 0) *100 + Result := StrToIntDef(v1, 0) *100 +
StrToIntDef(v2, 0); StrToIntDef(v2, 0);
end else begin
rx.Expression := '(\d+)[,\.](\d+)[,\.](\d+)[,\.](\d+)';
if rx.Exec(FServerVersionUntouched) then begin
Result := StrToIntDef(rx.Match[1], 0) *100 +
StrToIntDef(rx.Match[2], 0);
end;
end; end;
end; end;
end; end;