paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-31 17:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Enable calculated Fields support

Browse Source
This commit is contained in:
michael 2018-07-17 07:53:30 +00:00
parent ffc2238def
commit 6adedb6ade
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-db/db.pas
View File

@ -1052,7 +1052,7 @@ type
FBeforeLoad: TDatasetNotifyEvent;
FBlockReadSize: Integer;
FCalcBuffer: TDataRecord;
FCalcFieldsSize: Longint;
FCalcFieldsCount: Longint;
FOnLoadFail: TDatasetLoadFailEvent;
FOnRecordResolved: TOnRecordResolveEvent;
FOpenAfterRead : boolean;
@ -1244,7 +1244,7 @@ type
property Buffers[Index: Longint]: TDataRecord read GetBuffer;
property BufferCount: Longint read GetBufferCount;
property CalcBuffer: TDataRecord read FCalcBuffer;
property CalcFieldsSize: Longint read FCalcFieldsSize;
property CalcFieldsCount: Longint read FCalcFieldsCount;
property InternalCalcFields: Boolean read FInternalCalcFields;
property Constraints: TCheckConstraints read FConstraints write SetConstraints;
function AllocRecordBuffer: TDataRecord; virtual;
@ -2367,7 +2367,7 @@ var i, FieldIndex: Integer;
begin
{ FieldNo is set to -1 for calculated/lookup fields, to 0 for unbound field
and for bound fields it is set to FieldDef.FieldNo }
FCalcFieldsSize := 0;
FCalcFieldsCount := 0;
FBlobFieldCount := 0;
for i := 0 to Fields.Count - 1 do
begin
@ -2378,8 +2378,8 @@ begin
else if Field.FieldKind in [fkCalculated, fkLookup] then
begin
Field.FFieldNo := -1;
Field.FOffset := FCalcFieldsSize;
Inc(FCalcFieldsSize, Field.DataSize + 1);
Field.FOffset := -1;
Inc(FCalcFieldsCount);
end
else
begin
@ -2518,10 +2518,9 @@ procedure TDataSet.DataEvent(Event: TDataEvent; Info: JSValue);
if aField.FieldKind = fkData then begin
if FInternalCalcFields then
RefreshInternalCalcFields(FBuffers[FActiveRecord])
else if FAutoCalcFields and (FCalcFieldsSize <> 0) then
else if FAutoCalcFields and (FCalcFieldsCount <> 0) then
CalculateFields(FBuffers[FActiveRecord]);
end;
aField.Change;
end;
end;
@ -3053,7 +3052,7 @@ end;
procedure TDataSet.GetCalcFields(var Buffer: TDataRecord);
begin
if (FCalcFieldsSize > 0) or FInternalCalcFields then
if (FCalcFieldsCount > 0) or FInternalCalcFields then
CalculateFields(Buffer);
end;

14
packages/fcl-db/jsondataset.pas
View File

@ -527,6 +527,7 @@ begin
Buffer.Data:=FRows[bkmIdx];
Buffer.BookmarkFlag := bfCurrent;
Buffer.Bookmark:=BkmIdx;
CalculateFields(Buffer);
end;
end;
@ -776,7 +777,9 @@ var
R : JSValue;
begin
if (FEditIdx=Buffer.Bookmark) then
if State in [dsCalcFields,dsInternalCalc] then
R:=CalcBuffer.data
else if (FEditIdx=Buffer.Bookmark) then
begin
if State=dsOldValue then
R:=Buffer.data
@ -795,8 +798,15 @@ end;
procedure TBaseJSONDataSet.SetFieldData(Field: TField; var Buffer: TDatarecord; AValue : JSValue);
var
R : JSValue;
begin
FFieldMapper.SetJSONDataForField(Field,FEditRow,AValue);
if State in [dsCalcFields,dsInternalCalc] then
R:=CalcBuffer.Data
else
R:=FEditRow;
FFieldMapper.SetJSONDataForField(Field,R,AValue);
SetModified(True);
// FFieldMapper.SetJSONDataForField(Field,Buffer.Data,AValue);
end;