...

Author: snakeice

src/ugar.db.Mongo.pas

@@ -47,7 +47,7 @@ interface
     function _GetDatabase: IUgarDatabase;
     function _GetName: String;
     function InsertOne(const ADocument: TUgarBsonDocument): Boolean; overload;
-    function InsertOne(const ADocument: TJsonObject): Boolean; overload;
+    function InsertOne(const ADocument: TJsonObject): TJSONObject; overload;
     function InsertOne(const ADocument: string): Boolean; overload;
 
     function InsertMany(const ADocuments: array of TUgarBsonDocument; const AOrdered: Boolean = True): Integer; overload;
@@ -75,7 +75,7 @@ interface
     function Find(const AFilter: TUgarFilter; const AProjection: TUgarProjection): IUgarCursor; overload;
     function Find(const AFilter: TUgarFilter): IUgarCursor; overload;
     function Find(const AProjection: TUgarProjection): IUgarCursor; overload;
-    function Find: IUgarCursor; overload;
+    function Find: TJSONArray; overload;
     function Find(const AFilter: TUgarFilter; const ASort: TUgarSort): IUgarCursor; overload;
     function Find(const AFilter: TUgarFilter; const AProjection: TUgarProjection; const ASort: TUgarSort)
       : IUgarCursor; overload;

src/ugar.db.mongo.internals.pas

@@ -94,7 +94,7 @@   TUgarCollection = class(TInterfacedObject, IUgarCollection)
     function _GetName: String;
 
     function InsertOne(const ADocument: TUgarBsonDocument): Boolean; overload;
-    function InsertOne(const ADocument: TJsonObject): Boolean; overload;
+    function InsertOne(const ADocument: TJsonObject): TJSONObject; overload;
     function InsertOne(const ADocument: string): Boolean; overload;
 
     function InsertMany(const ADocuments: array of TUgarBsonDocument; const AOrdered: Boolean = True): Integer; overload;
@@ -120,7 +120,7 @@   TUgarCollection = class(TInterfacedObject, IUgarCollection)
     function Find(const AFilter: TUgarFilter; const AProjection: TUgarProjection): IUgarCursor; overload;
     function Find(const AFilter: TUgarFilter): IUgarCursor; overload;
     function Find(const AProjection: TUgarProjection): IUgarCursor; overload;
-    function Find: IUgarCursor; overload;
+    function Find: TJSONArray; overload;
     function Find(const AFilter: TUgarFilter; const ASort: TUgarSort): IUgarCursor; overload;
     function Find(const AFilter: TUgarFilter; const AProjection: TUgarProjection; const ASort: TUgarSort)
       : IUgarCursor; overload;
@@ -354,9 +354,19 @@ function TUgarCollection.Find(const AFilter, AProjection: TBytes): IUgarCursor;
   Result := TUgarCursor.Create(FProtocol, FFullName, Reply.Documents, Reply.CursorId);
 end;
 
-function TUgarCollection.Find: IUgarCursor;
+function TUgarCollection.Find: TJSONArray;
+var
+  LBSON: TEnumerator<TUgarBsonDocument>;
 begin
-  Result := Find(nil, nil);
+  Result := TJSONArray.Create;
+
+  LBSON := Find(nil, nil).GetEnumerator;
+
+  while LBSON.MoveNext do
+  begin
+    Result.AddElement(TJSONObject.ParseJSONValue(LBSON.Current.ToJson));
+  end;
+
 end;
 
 function TUgarCollection.FindOne(const AFilter, AProjection: TBytes): TUgarBsonDocument;
@@ -466,9 +476,10 @@ function TUgarCollection.InsertOne(const ADocument: TUgarBsonDocument): Boolean;
   Result := (HandleCommandReply(Reply) = 1);
 end;
 
-function TUgarCollection.InsertOne(const ADocument: TJsonObject): Boolean;
+function TUgarCollection.InsertOne(const ADocument: TJsonObject): TJSONObject;
 begin
-  Result := InsertOne(TUgarBsonDocument.Parse(ADocument.ToJSON));
+  InsertOne(TUgarBsonDocument.Parse(ADocument.ToJSON));
+  Result := ADocument;
 end;
 
 function TUgarCollection.InsertMany(const ADocuments: TArray<TJsonObject>; const AOrdered: Boolean): Integer;
@@ -656,8 +667,10 @@ function TUgarCursor.TEnumerator.DoMoveNext: Boolean;
   if Result then
     Inc(FIndex)
   else if (FCursorId <> 0) then
+  begin
     GetMore;
-  Result := (FPage <> nil);
+    Result := (FPage <> nil);
+  end;
 end;
 
 procedure TUgarCursor.TEnumerator.GetMore;