[Instantobjects-cvscommit] Source/Core InstantPump.pas,1.3,1.4

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17515/Core

Modified Files:
	InstantPump.pas 
Log Message:
small amendments

Index: InstantPump.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPump.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantPump.pas	17 Nov 2004 20:59:48 -0000	1.3
--- InstantPump.pas	12 Feb 2005 11:51:41 -0000	1.4
***************
*** 104,108 ****
  procedure TInstantPump.SetDestConnector(const Value: TInstantConnector);
  begin
!   if Value <> FDestConnector then begin
      if Assigned(FDestConnector) then
        FDestConnector.RemoveFreeNotification(Self);
--- 104,109 ----
  procedure TInstantPump.SetDestConnector(const Value: TInstantConnector);
  begin
!   if Value <> FDestConnector then
!   begin
      if Assigned(FDestConnector) then
        FDestConnector.RemoveFreeNotification(Self);
***************
*** 115,119 ****
  procedure TInstantPump.SetSourceConnector(const Value: TInstantConnector);
  begin
!   if Value <> FSourceConnector then begin
      if Assigned(FSourceConnector) then
        FSourceConnector.RemoveFreeNotification(Self);
--- 116,121 ----
  procedure TInstantPump.SetSourceConnector(const Value: TInstantConnector);
  begin
!   if Value <> FSourceConnector then
!   begin
      if Assigned(FSourceConnector) then
        FSourceConnector.RemoveFreeNotification(Self);
***************
*** 195,201 ****
    FDestConnector.StartTransaction;
    try
!     for I := 0 to Pred(Model.ClassMetadatas.Count) do begin
        ClassMetadata := Model.ClassMetadatas[I];
!       if ClassMetadata.IsStored then begin
          if poEmptyDestBeforePump in FOptions then
            DeleteAllDestObjects(ClassMetadata);
--- 197,205 ----
    FDestConnector.StartTransaction;
    try
!     for I := 0 to Pred(Model.ClassMetadatas.Count) do
!     begin
        ClassMetadata := Model.ClassMetadatas[I];
!       if ClassMetadata.IsStored then
!       begin
          if poEmptyDestBeforePump in FOptions then
            DeleteAllDestObjects(ClassMetadata);
***************
*** 220,231 ****
      Query.Command := 'select * from ' + ClassMetadata.Name + ' order by Id';
      Query.Open;
!     for i := 0 to Query.ObjectCount -1 do
!     begin
!       SourceObject :=  Query.Objects[i] as TInstantObject;
!       DestObject := TInstantObjectClass(Query.ObjectClass).Clone(SourceObject, FDestConnector);
!       DestObject.Store;
      end;
    finally
-     Query.Close;
      Query.Free;
    end;
--- 224,238 ----
      Query.Command := 'select * from ' + ClassMetadata.Name + ' order by Id';
      Query.Open;
!     try
!       for i := 0 to Query.ObjectCount -1 do
!       begin
!         SourceObject :=  Query.Objects[i] as TInstantObject;
!         DestObject := TInstantObjectClass(Query.ObjectClass).Clone(SourceObject, FDestConnector);
!         DestObject.Store;
!       end;
!     finally
!       Query.Close;
      end;
    finally
      Query.Free;
    end;
***************
*** 241,251 ****
      Query.Command := 'select * from ' + ClassMetadata.Name + ' order by Id';
      Query.Open;
!     for i := 0 to Query.ObjectCount -1 do
!     begin
!       if (Query.Objects[i] is TInstantObject) then
!         TInstantObject(Query.Objects[i]).Dispose;
!     end;    
    finally
-     Query.Close;
      Query.Free;
    end;
--- 248,261 ----
      Query.Command := 'select * from ' + ClassMetadata.Name + ' order by Id';
      Query.Open;
!     try
!       for i := 0 to Query.ObjectCount -1 do
!       begin
!         if (Query.Objects[i] is TInstantObject) then
!           TInstantObject(Query.Objects[i]).Dispose;
!       end;
!     finally
!       Query.Close;
!     end;
    finally
      Query.Free;
    end;
***************
*** 255,259 ****
  begin
    inherited;
!   if Operation = opRemove then begin
      if AComponent = FSourceConnector then
        FSourceConnector := nil;
--- 265,270 ----
  begin
    inherited;
!   if Operation = opRemove then
!   begin
      if AComponent = FSourceConnector then
        FSourceConnector := nil;