瀏覽代碼

* Rename newly introduced method

Michaël Van Canneyt 3 年之前
父節點
當前提交
571ad193dc
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      packages/fcl-db/db.pas
  2. 2 2
      packages/fcl-db/jsondataset.pas

+ 4 - 4
packages/fcl-db/db.pas

@@ -1184,7 +1184,7 @@ type
     Procedure DoneChangeList; virtual;
     Procedure ClearChangeList;
     procedure ResetUpdateDescriptors;
-    function GetUpdateData(aBuffer: TDataRecord) : JSValue; virtual;
+    function GetApplyUpdateData(aBuffer: TDataRecord) : JSValue; virtual;
     Function IndexInChangeList(aBookmark: TBookmark): Integer; virtual;
     Function AddToChangeList(aChange : TUpdateStatus) : TRecordUpdateDescriptor ; virtual;
     Procedure RemoveFromChangeList(R : TRecordUpdateDescriptor); virtual;
@@ -2877,7 +2877,7 @@ begin
     Dec(Result);
 end;
 
-function TDataSet.GetUpdateData(aBuffer : TDataRecord) : JSValue;
+function TDataSet.GetApplyUpdateData(aBuffer : TDataRecord) : JSValue;
 
 begin
   Result:=aBuffer.Data;
@@ -2898,7 +2898,7 @@ begin
   I:=IndexInChangeList(B);
   if (I=-1) then
     begin
-    aData:=GetUpdateData(ActiveBuffer);
+    aData:=GetApplyUpdateData(ActiveBuffer);
     if Assigned(DataProxy) then
       Result:=DataProxy.GetUpdateDescriptor(Self,B,aData,aChange)
     else
@@ -2917,7 +2917,7 @@ begin
           Result.FStatus:=usDeleted;
         end;
       usInserted : DatabaseError(SErrInsertingSameRecordtwice,Self);
-      usModified : Result.FData:=GetUpdateData(ActiveBuffer);
+      usModified : Result.FData:=GetApplyUpdateData(ActiveBuffer);
     end
     end;
 end;

+ 2 - 2
packages/fcl-db/jsondataset.pas

@@ -327,7 +327,7 @@ type
     procedure SetFilterText(const Value: string); override;
     procedure SetFiltered(Value: Boolean); override;
     function  GetFieldClass(FieldType: TFieldType): TFieldClass; override;
-    Function GetUpdateData(Buffer : TDataRecord) : JSValue; override;
+    Function GetApplyUpdateData(Buffer : TDataRecord) : JSValue; override;
     function IsCursorOpen: Boolean; override;
     // Bookmark operations
     procedure GetBookmarkData(Buffer: TDataRecord; var Data: TBookmark); override;
@@ -1609,7 +1609,7 @@ begin
     Result:=inherited GetFieldClass(FieldType);
 end;
 
-function TBaseJSONDataSet.GetUpdateData(Buffer: TDataRecord): JSValue;
+function TBaseJSONDataSet.GetApplyUpdateData(Buffer: TDataRecord): JSValue;
 begin
   Result:=FieldMapper.CopyRow(Buffer.Data);
   RemoveCalcFields(Result);