Merge pull request #13 from mateusvicente100/master

Do not open an dataset with zero fields
viniciussanchez · Aug 20, 2019 · c97e5b3 · c97e5b3
2 parents c6d6e72 + b047522
commit c97e5b3
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/core/RESTRequest4D.Request.pas b/src/core/RESTRequest4D.Request.pas
@@ -71,10 +71,10 @@ procedure TRequest.ActiveCachedUpdates(const ADataSet: TDataSet; const AActive:
     if ADataSet is TFDMemTable then
     begin
       if not AActive then
-        TFDDataSet(ADataSet).Close;
-      TFDDataSet(ADataSet).CachedUpdates := AActive;
-      if not AActive then
-        TFDDataSet(ADataSet).Open;
+        TFDMemTable(ADataSet).Close;
+      TFDMemTable(ADataSet).CachedUpdates := AActive;
+      if AActive and not TFDMemTable(ADataSet).Active then
+        TFDMemTable(ADataSet).Open;
     end;
     ADataSet.GetDetailDataSets(LDataSetDetails);
     for LDataSet in LDataSetDetails do
@@ -126,9 +126,7 @@ destructor TRequest.Destroy;
 procedure TRequest.DoAfterExecute(Sender: TCustomRESTRequest);
 begin
   if not Assigned(FDataSetAdapter) then
-    Exit;
-  if not FDataSetAdapter.Active then
-    FDataSetAdapter.Open;
+    Exit;  
   ActiveCachedUpdates(FDataSetAdapter, False);
   FDataSetAdapter.LoadFromJSON(FRESTResponse.Content);
   ActiveCachedUpdates(FDataSetAdapter);