@@ -235,44 +235,30 @@ fn insert_entity(
235
235
assert_eq ! ( inserted, entities_with_keys_owned. len( ) ) ;
236
236
}
237
237
238
- fn update_entity (
239
- conn : & PgConnection ,
240
- layout : & Layout ,
241
- entity_type : & str ,
242
- mut entities : Vec < Entity > ,
243
- ) {
244
- let entities_with_keys_owned: Vec < ( EntityKey , Entity ) > = entities
245
- . drain ( ..)
246
- . map ( |entity| {
247
- let key = EntityKey :: data (
248
- THINGS_SUBGRAPH_ID . clone ( ) ,
249
- entity_type. to_owned ( ) ,
250
- entity. id ( ) . unwrap ( ) ,
251
- ) ;
252
- ( key, entity)
253
- } )
254
- . collect ( ) ;
255
- let mut entities_with_keys: Vec < _ > = entities_with_keys_owned
256
- . iter ( )
257
- . map ( |( key, entity) | ( key, Cow :: from ( entity) ) )
258
- . collect ( ) ;
238
+ fn update_entity ( conn : & PgConnection , layout : & Layout , entity_type : & str , entity : Entity ) {
239
+ let key = EntityKey :: data (
240
+ THINGS_SUBGRAPH_ID . clone ( ) ,
241
+ entity_type. to_owned ( ) ,
242
+ entity. id ( ) . unwrap ( ) ,
243
+ ) ;
244
+ let mut entity_with_keys = vec ! [ ( & key, Cow :: from( & entity) ) ] ;
259
245
260
246
let entity_type = EntityType :: from ( entity_type) ;
261
247
let errmsg = format ! (
262
248
"Failed to insert entities {}[{:?}]" ,
263
- entity_type, entities_with_keys
249
+ entity_type, entity_with_keys
264
250
) ;
265
251
266
252
let updated = layout
267
253
. update (
268
254
& conn,
269
255
& entity_type,
270
- & mut entities_with_keys ,
256
+ & mut entity_with_keys ,
271
257
0 ,
272
258
& MOCK_STOPWATCH ,
273
259
)
274
260
. expect ( & errmsg) ;
275
- assert_eq ! ( updated, entities_with_keys_owned . len ( ) ) ;
261
+ assert_eq ! ( updated, 1 ) ;
276
262
}
277
263
278
264
fn insert_user_entity (
@@ -394,7 +380,7 @@ fn update_user_entity(
394
380
user. insert ( "drinks" . to_owned ( ) , drinks. into ( ) ) ;
395
381
}
396
382
397
- update_entity ( conn, layout, entity_type, vec ! [ user] ) ;
383
+ update_entity ( conn, layout, entity_type, user) ;
398
384
}
399
385
400
386
fn insert_pet ( conn : & PgConnection , layout : & Layout , entity_type : & str , id : & str , name : & str ) {
0 commit comments