@@ -251,31 +251,6 @@ def __str__(self):
251
251
)
252
252
253
253
254
- class CollectionFileItem (models .Model ):
255
- """An item within a file in the collection."""
256
-
257
- collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False )
258
-
259
- number = models .IntegerField (blank = True )
260
-
261
- class Meta :
262
- db_table = "collection_file_item"
263
- indexes = [
264
- # ForeignKey with db_index=False.
265
- models .Index (name = "collection_file_item_collection_file_id_idx" , fields = ["collection_file" ]),
266
- ]
267
- constraints = [
268
- models .UniqueConstraint (
269
- name = "unique_collection_file_item_identifiers" , fields = ["collection_file" , "number" ]
270
- ),
271
- ]
272
-
273
- def __str__ (self ):
274
- return "{collection_file_id}:{number} (id: {id})" .format_map (
275
- Default (number = self .number , collection_file_id = self .collection_file_id , id = self .pk )
276
- )
277
-
278
-
279
254
class Data (models .Model ):
280
255
"""The contents of a release, record or compiled release."""
281
256
@@ -314,8 +289,7 @@ class Release(models.Model):
314
289
"""A release."""
315
290
316
291
collection = models .ForeignKey (Collection , on_delete = models .CASCADE , db_index = False )
317
- collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False , null = True )
318
- collection_file_item = models .ForeignKey (CollectionFileItem , on_delete = models .CASCADE , db_index = False , null = True )
292
+ collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False )
319
293
320
294
ocid = models .TextField (blank = True )
321
295
release_id = models .TextField (blank = True )
@@ -332,7 +306,6 @@ class Meta:
332
306
# ForeignKey with db_index=False.
333
307
models .Index (name = "release_collection_id_idx" , fields = ["collection" ]),
334
308
models .Index (name = "release_collection_file_id_idx" , fields = ["collection_file" ]),
335
- models .Index (name = "release_collection_file_item_id_idx" , fields = ["collection_file_item" ]),
336
309
models .Index (name = "release_data_id_idx" , fields = ["data" ]),
337
310
models .Index (name = "release_package_data_id_idx" , fields = ["package_data" ]),
338
311
]
@@ -349,8 +322,7 @@ class Record(models.Model):
349
322
"""A record."""
350
323
351
324
collection = models .ForeignKey (Collection , on_delete = models .CASCADE , db_index = False )
352
- collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False , null = True )
353
- collection_file_item = models .ForeignKey (CollectionFileItem , on_delete = models .CASCADE , db_index = False , null = True )
325
+ collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False )
354
326
355
327
ocid = models .TextField (blank = True )
356
328
@@ -365,7 +337,6 @@ class Meta:
365
337
# ForeignKey with db_index=False.
366
338
models .Index (name = "record_collection_id_idx" , fields = ["collection" ]),
367
339
models .Index (name = "record_collection_file_id_idx" , fields = ["collection_file" ]),
368
- models .Index (name = "record_collection_file_item_id_idx" , fields = ["collection_file_item" ]),
369
340
models .Index (name = "record_data_id_idx" , fields = ["data" ]),
370
341
models .Index (name = "record_package_data_id_idx" , fields = ["package_data" ]),
371
342
]
@@ -380,8 +351,7 @@ class CompiledRelease(models.Model):
380
351
"""A compiled release."""
381
352
382
353
collection = models .ForeignKey (Collection , on_delete = models .CASCADE , db_index = False )
383
- collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False , null = True )
384
- collection_file_item = models .ForeignKey (CollectionFileItem , on_delete = models .CASCADE , db_index = False , null = True )
354
+ collection_file = models .ForeignKey (CollectionFile , on_delete = models .CASCADE , db_index = False )
385
355
386
356
ocid = models .TextField (blank = True )
387
357
release_date = models .TextField (blank = True )
@@ -396,7 +366,6 @@ class Meta:
396
366
# ForeignKey with db_index=False.
397
367
models .Index (name = "compiled_release_collection_id_idx" , fields = ["collection" ]),
398
368
models .Index (name = "compiled_release_collection_file_id_idx" , fields = ["collection_file" ]),
399
- models .Index (name = "compiled_release_collection_file_item_id_idx" , fields = ["collection_file_item" ]),
400
369
models .Index (name = "compiled_release_data_id_idx" , fields = ["data" ]),
401
370
]
402
371
0 commit comments