Permalink
Browse files

Fix detection of PostgreSQL version ignoring the 3rd version segment,…

… and use the same logic as for MySQL again. See issue #137.
  • Loading branch information...
ansgarbecker committed Feb 14, 2018
1 parent 0db22ee commit 52c3fb43a2d3cc45fa424822d64839f9ba472b60
Showing with 4 additions and 12 deletions.
  1. +4 −12 source/dbconnection.pas
@@ -3319,17 +3319,17 @@ function TPgConnection.GetLastError: String;
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 @@ function TDBConnection.ServerVersionInt: Integer;
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;

0 comments on commit 52c3fb4

Please sign in to comment.