@@ -44,8 +44,8 @@ use collab_entity::CollabType;
4444use collab_entity:: define:: { DATABASE , DATABASE_ID , DATABASE_METAS } ;
4545use collab_entity:: uuid_validation:: { DatabaseId , DatabaseViewId } ;
4646
47- use futures:: stream:: { BoxStream , StreamExt } ;
4847use futures:: stream;
48+ use futures:: stream:: { BoxStream , StreamExt } ;
4949use nanoid:: nanoid;
5050
5151use crate :: database_trait:: { DatabaseCollabService , DatabaseDataVariant , DatabaseRowCollabService } ;
@@ -657,18 +657,22 @@ impl Database {
657657 let row_ids = row_orders. iter ( ) . map ( |order| order. id ) . collect ( ) ;
658658 let rows_stream = self . init_database_rows ( row_ids, chunk_size, cancel_token, auto_fetch) ;
659659 let database_id = self . get_database_id ( ) ?;
660- Ok ( rows_stream. then ( move |result| {
661- let database_id = database_id;
662- async move {
663- let row = result?;
664- let read_guard = row. read ( ) . await ;
665- let row_id = read_guard. row_id ;
666- let row = read_guard
667- . get_row ( )
668- . unwrap_or_else ( || Row :: empty ( row_id, database_id) ) ;
669- Ok ( row)
670- }
671- } ) . boxed ( ) )
660+ Ok (
661+ rows_stream
662+ . then ( move |result| {
663+ let database_id = database_id;
664+ async move {
665+ let row = result?;
666+ let read_guard = row. read ( ) . await ;
667+ let row_id = read_guard. row_id ;
668+ let row = read_guard
669+ . get_row ( )
670+ . unwrap_or_else ( || Row :: empty ( row_id, database_id) ) ;
671+ Ok ( row)
672+ }
673+ } )
674+ . boxed ( ) ,
675+ )
672676 }
673677
674678 /// Return a list of [RowCell] for the given view and field.
0 commit comments