From 63a231a93d93ce645fcdf97141314ef42784af8a Mon Sep 17 00:00:00 2001 From: ondrej Date: Fri, 27 Nov 2020 09:45:03 +0000 Subject: [PATCH] * fcl-db: PQConnection needs a lowercase port param git-svn-id: trunk@47607 - --- packages/fcl-db/src/sqldb/postgres/pqconnection.pp | 7 +++++++ packages/fcl-db/src/sqldb/sqldb.pp | 14 ++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp index 3f30b62e4c..be8b5b9968 100644 --- a/packages/fcl-db/src/sqldb/postgres/pqconnection.pp +++ b/packages/fcl-db/src/sqldb/postgres/pqconnection.pp @@ -104,6 +104,8 @@ type // Release connection in pool. procedure ReleaseConnection(Conn: PPGConn; DoClear : Boolean); + function PortParamName: string; override; + procedure DoInternalConnect; override; procedure DoInternalDisconnect; override; function GetHandle : pointer; override; @@ -1419,6 +1421,11 @@ begin end; end; +function TPQConnection.PortParamName: string; +begin + Result := 'port'; +end; + procedure TPQConnection.UpdateIndexDefs(IndexDefs : TIndexDefs;TableName : string); var qry : TSQLQuery; diff --git a/packages/fcl-db/src/sqldb/sqldb.pp b/packages/fcl-db/src/sqldb/sqldb.pp index 5c6848a671..88aca65cae 100644 --- a/packages/fcl-db/src/sqldb/sqldb.pp +++ b/packages/fcl-db/src/sqldb/sqldb.pp @@ -222,6 +222,7 @@ type procedure ApplyRecUpdate(Query : TCustomSQLQuery; UpdateKind : TUpdateKind); virtual; function RefreshLastInsertID(Query : TCustomSQLQuery; Field : TField): Boolean; virtual; procedure GetDBInfo(const ASchemaType : TSchemaType; const ASchemaObjectName, AReturnField : string; AList: TStrings); + function PortParamName: string; virtual; function GetConnectionCharSet: string; virtual; procedure SetTransaction(Value : TSQLTransaction); virtual; procedure DoConnect; override; @@ -1519,7 +1520,7 @@ end; function TSQLConnection.GetPort: cardinal; begin - result := StrToIntDef(Params.Values['Port'],0); + result := StrToIntDef(Params.Values[PortParamName],0); end; procedure TSQLConnection.SetOptions(AValue: TSQLConnectionOptions); @@ -1532,9 +1533,9 @@ end; procedure TSQLConnection.SetPort(const AValue: cardinal); begin if AValue<>0 then - Params.Values['Port']:=IntToStr(AValue) - else with params do if IndexOfName('Port') > -1 then - Delete(IndexOfName('Port')); + Params.Values[PortParamName]:=IntToStr(AValue) + else with params do if IndexOfName(PortParamName) > -1 then + Delete(IndexOfName(PortParamName)); end; function TSQLConnection.AttemptCommit(trans: TSQLHandle): boolean; @@ -2317,6 +2318,11 @@ begin end; end; +function TSQLConnection.PortParamName: string; +begin + Result := 'Port'; +end; + procedure TSQLConnection.CreateDB; begin