opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix detection of PostgreSQL version ignoring the 3rd version segment, and use the same logic as for MySQL again. See issue #137.

Browse Source
This commit is contained in:
Ansgar Becker
2018-02-14 07:43:57 +01:00
parent 0db22ee281
commit 52c3fb43a2
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/dbconnection.pas
View File

@@ -3319,17 +3319,17 @@ end;
function TDBConnection.ServerVersionInt: Integer;
var
rx: TRegExpr;
v1, v2, v3: String;
v1, v2: String;
begin
Result := 0;
rx := TRegExpr.Create;
case FParameters.NetTypeGroup of
ngMySQL: begin
rx.Expression := '(\d+)\.(\d+)\.(\d+)';
ngMySQL, ngPgSQL: begin
rx.Expression := '(\d+)\.(\d+)(\.(\d+))?';
if rx.Exec(FServerVersionUntouched) then begin
Result := StrToIntDef(rx.Match[1], 0) *10000 +
StrToIntDef(rx.Match[2], 0) *100 +
StrToIntDef(rx.Match[3], 0);
StrToIntDef(rx.Match[4], 0);
end;
end;
ngMSSQL: begin
@@ -3352,14 +3352,6 @@ begin
end;
end;
end;
ngPgSQL: begin
rx.Expression := '(\d+)\.(\d+)(\.(\d+))?';
if rx.Exec(FServerVersionUntouched) then begin
Result := StrToIntDef(rx.Match[1], 0) *10000 +
StrToIntDef(rx.Match[2], 0) *100 +
StrToIntDef(rx.Match[3], 0);
end;
end;
end;
rx.Free;
end;