paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-14 12:47:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch to add support for charset (bug 22985)

Browse Source 
git-svn-id: trunk@22470 -
This commit is contained in:
michael 2012-09-27 09:10:08 +00:00
parent 032d96b415
commit f019e004ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/fcl-db/src/sqldb/postgres/pqconnection.pp
View File

@ -246,10 +246,7 @@ function TPQConnection.StartdbTransaction(trans : TSQLHandle; AParams : string)
var var
res : PPGresult; res : PPGresult;
tr : TPQTrans; tr : TPQTrans;
msg : string;
begin begin
result := false;
tr := trans as TPQTrans; tr := trans as TPQTrans;
tr.PGConn := PQconnectdb(pchar(FConnectString)); tr.PGConn := PQconnectdb(pchar(FConnectString));
@ -263,6 +260,10 @@ begin
else else
begin begin
tr.ErrorOccured := False; tr.ErrorOccured := False;
if CharSet <> '' then
PQsetClientEncoding(tr.PGConn, pchar(CharSet));
res := PQexec(tr.PGConn, 'BEGIN'); res := PQexec(tr.PGConn, 'BEGIN');
CheckResultError(res,tr.PGConn,sErrTransactionFailed); CheckResultError(res,tr.PGConn,sErrTransactionFailed);
@ -275,7 +276,6 @@ procedure TPQConnection.RollBackRetaining(trans : TSQLHandle);
var var
res : PPGresult; res : PPGresult;
tr : TPQTrans; tr : TPQTrans;
msg : string;
begin begin
tr := trans as TPQTrans; tr := trans as TPQTrans;
res := PQexec(tr.PGConn, 'ROLLBACK'); res := PQexec(tr.PGConn, 'ROLLBACK');
@ -292,7 +292,6 @@ procedure TPQConnection.CommitRetaining(trans : TSQLHandle);
var var
res : PPGresult; res : PPGresult;
tr : TPQTrans; tr : TPQTrans;
msg : string;
begin begin
tr := trans as TPQTrans; tr := trans as TPQTrans;
res := PQexec(tr.PGConn, 'COMMIT'); res := PQexec(tr.PGConn, 'COMMIT');
@ -528,7 +527,7 @@ const TypeStrings : array[TFieldType] of string =
); );
var s,serr : string; var s : string;
i : integer; i : integer;
begin begin