paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 01:39:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Added ActualSQL and ParamValue log types, correct SQLConnector so it passes log options on

Browse Source 
git-svn-id: trunk@31157 -
This commit is contained in:
michael 2015-06-26 09:00:09 +00:00
parent e209b1604f
commit 71ab58a2f1
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -49,7 +49,7 @@ type
TSQLScript = class;
TDBEventType = (detCustom, detPrepare, detExecute, detFetch, detCommit, detRollBack);
TDBEventType = (detCustom, detPrepare, detExecute, detFetch, detCommit, detRollBack, detParamValue, detActualSQL);
TDBEventTypes = set of TDBEventType;
TDBLogNotifyEvent = Procedure (Sender : TSQLConnection; EventType : TDBEventType; Const Msg : String) of object;
@ -116,7 +116,8 @@ type
const
SingleQuotes : TQuoteChars = ('''','''');
DoubleQuotes : TQuoteChars = ('"','"');
LogAllEvents = [detCustom, detPrepare, detExecute, detFetch, detCommit, detRollBack];
LogAllEvents = [detCustom, detPrepare, detExecute, detFetch, detCommit, detRollBack];
LogAllEventsExtra = [detCustom, detPrepare, detExecute, detFetch, detCommit, detRollBack, detParamValue,detActualSQL];
StatementTokens : Array[TStatementType] of string = ('(unknown)', 'select',
'insert', 'update', 'delete',
'create', 'get', 'put', 'execute',
@ -190,6 +191,7 @@ type
function GetAsSQLText(Param : TParam) : string; overload; virtual;
function GetHandle : pointer; virtual;
Function LogEvent(EventType : TDBEventType) : Boolean;
Procedure LogParams(Const AParams : TParams); virtual;
Procedure Log(EventType : TDBEventType; Const Msg : String); virtual;
Procedure RegisterStatement(S : TCustomSQLStatement);
Procedure UnRegisterStatement(S : TCustomSQLStatement);
@ -1579,6 +1581,27 @@ begin
Result:=(Assigned(FOnLog) or Assigned(GlobalDBLogHook)) and (EventType in LogEvents);
end;
procedure TSQLConnection.LogParams(const AParams: TParams);
Var
S : String;
P : TParam;
begin
if not LogEvent(detParamValue) then
Exit;
For P in AParams do
begin
if P.IsNull then
S:='<NULL>'
else if (P.DataType in ftBlobTypes) and not (P.DataType in [ftMemo, ftFmtMemo,ftWideMemo]) then
S:='<BLOB>'
else
S:=P.AsString;
Log(detParamValue,Format(SLogParamValue,[P.Name,S]));
end;
end;
procedure TSQLConnection.Log(EventType: TDBEventType; const Msg: String);
Var
@ -3273,6 +3296,9 @@ begin
FProxy.Role:=Self.Role;
FProxy.UserName:=Self.UserName;
FProxy.FTransaction:=Self.Transaction;
FProxy.LogEvents:=Self.LogEvents;
FProxy.OnLog:=Self.OnLog;
FProxy.Options:=Self.Options;
D:=GetConnectionDef(ConnectorType);
D.ApplyParams(Params,FProxy);
FProxy.Connected:=True;