@@ -180,9 +180,7 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
180
180
let mut modules = Vec :: new ( ) ;
181
181
while let Some ( metadata_document) = query_stream. next ( self . tx , None ) . await ? {
182
182
let metadata: ParsedDocument < ModuleMetadata > = metadata_document. try_into ( ) ?;
183
- if !metadata. deleted {
184
- modules. push ( metadata) ;
185
- }
183
+ modules. push ( metadata) ;
186
184
}
187
185
Ok ( modules)
188
186
}
@@ -250,8 +248,7 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
250
248
if path. is_system ( ) && !( self . tx . identity ( ) . is_admin ( ) || self . tx . identity ( ) . is_system ( ) ) {
251
249
anyhow:: bail!( unauthorized_error( "get_module" ) )
252
250
}
253
- let include_deleted = false ;
254
- let module_metadata = match self . module_metadata ( path, include_deleted) . await ? {
251
+ let module_metadata = match self . module_metadata ( path) . await ? {
255
252
Some ( r) => r,
256
253
None => return Ok ( None ) ,
257
254
} ;
@@ -279,19 +276,13 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
279
276
path. is_deps( ) || analyze_result. is_some( ) ,
280
277
"AnalyzedModule is required for non-dependency modules"
281
278
) ;
282
- // If there was a previously deleted document, it is important to replace
283
- // it instead of adding a new one, in order to have at most one document
284
- // for each path.
285
- let include_deleted = true ;
286
- let ( module_id, version) = match self . module_metadata ( path. clone ( ) , include_deleted) . await ?
287
- {
279
+ let ( module_id, version) = match self . module_metadata ( path. clone ( ) ) . await ? {
288
280
Some ( module_metadata) => {
289
281
let previous_version = module_metadata. latest_version ;
290
282
let latest_version = previous_version + 1 ;
291
283
let new_metadata = ModuleMetadata {
292
284
path,
293
285
latest_version,
294
- deleted : false ,
295
286
} ;
296
287
SystemMetadataModel :: new ( self . tx )
297
288
. replace ( module_metadata. id ( ) , new_metadata. try_into ( ) ?)
@@ -313,7 +304,6 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
313
304
let new_metadata = ModuleMetadata {
314
305
path,
315
306
latest_version : version,
316
- deleted : false ,
317
307
} ;
318
308
319
309
let document_id = SystemMetadataModel :: new ( self . tx )
@@ -357,8 +347,7 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
357
347
if !( self . tx . identity ( ) . is_admin ( ) || self . tx . identity ( ) . is_system ( ) ) {
358
348
anyhow:: bail!( unauthorized_error( "delete_module" ) ) ;
359
349
}
360
- let include_deleted = false ;
361
- if let Some ( module_metadata) = self . module_metadata ( path, include_deleted) . await ? {
350
+ if let Some ( module_metadata) = self . module_metadata ( path) . await ? {
362
351
let module_id = module_metadata. id ( ) ;
363
352
SystemMetadataModel :: new ( self . tx ) . delete ( module_id) . await ?;
364
353
@@ -377,7 +366,6 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
377
366
async fn module_metadata (
378
367
& mut self ,
379
368
path : CanonicalizedModulePath ,
380
- include_deleted : bool ,
381
369
) -> anyhow:: Result < Option < ParsedDocument < ModuleMetadata > > > {
382
370
let index_range = IndexRange {
383
371
index_name : MODULE_INDEX_BY_PATH . clone ( ) ,
@@ -394,9 +382,6 @@ impl<'a, RT: Runtime> ModuleModel<'a, RT> {
394
382
Some ( v) => v. try_into ( ) ?,
395
383
None => return Ok ( None ) ,
396
384
} ;
397
- if !include_deleted && module_document. deleted {
398
- return Ok ( None ) ;
399
- }
400
385
Ok ( Some ( module_document) )
401
386
}
402
387
0 commit comments