dunkelstern/inventory
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Sort with custom collation that sorts numbers in natural order

Browse source
This commit is contained in:
Johannes Schriewer 2025-01-06 01:00:12 +01:00
parent a9ce23aea7
commit 4c58206fbc
4 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
inventory/migrations/0005_alter_sorting_collation.py Normal file
View file

@ -0,0 +1,44 @@
# Generated by Django 5.1.4 on 2025-01-05 23:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('inventory', '0004_alter_default_ordering'),
]
operations = [
migrations.RunSQL("CREATE COLLATION IF NOT EXISTS numeric (provider = icu, locale = 'en@colNumeric=yes');"),
migrations.AlterField(
model_name='formfactor',
name='description',
field=models.CharField(db_collation='numeric', max_length=4096),
),
migrations.AlterField(
model_name='formfactor',
name='name',
field=models.CharField(db_collation='numeric', max_length=255, unique=True),
),
migrations.AlterField(
model_name='item',
name='description',
field=models.CharField(db_collation='numeric', max_length=4096),
),
migrations.AlterField(
model_name='item',
name='name',
field=models.TextField(db_collation='numeric', max_length=255),
),
migrations.AlterField(
model_name='tag',
name='description',
field=models.CharField(db_collation='numeric', max_length=4096),
),
migrations.AlterField(
model_name='tag',
name='name',
field=models.CharField(db_collation='numeric', max_length=255, unique=True),
),
]

4
inventory/models/form_factor.py
View file

@ -2,8 +2,8 @@ from django.db import models
class FormFactor(models.Model): class FormFactor(models.Model):
name = models.CharField(max_length=255, unique=True) name = models.CharField(max_length=255, unique=True, db_collation="numeric")
description = models.CharField(max_length=4096) description = models.CharField(max_length=4096, db_collation="numeric")
icon = models.ImageField(null=True, blank=True) icon = models.ImageField(null=True, blank=True)
datasheet = models.FileField(null=True, blank=True) datasheet = models.FileField(null=True, blank=True)

4
inventory/models/item.py
View file

@ -4,8 +4,8 @@ from .container import CanBeContained
class Item(CanBeContained): class Item(CanBeContained):
name = models.TextField(max_length=255) name = models.TextField(max_length=255, db_collation="numeric")
description = models.CharField(max_length=4096) description = models.CharField(max_length=4096, db_collation="numeric")
size = models.PositiveIntegerField(default=1, help_text="Number of sub-compartments this item takes up") size = models.PositiveIntegerField(default=1, help_text="Number of sub-compartments this item takes up")
form_factor = models.ForeignKey('inventory.FormFactor', null=True, blank=True, on_delete=models.PROTECT) form_factor = models.ForeignKey('inventory.FormFactor', null=True, blank=True, on_delete=models.PROTECT)
manufacturer = models.ForeignKey('inventory.Manufacturer', null=True, blank=True, on_delete=models.PROTECT) manufacturer = models.ForeignKey('inventory.Manufacturer', null=True, blank=True, on_delete=models.PROTECT)

4
inventory/models/tag.py
View file

@ -2,8 +2,8 @@ from django.db import models
class Tag(models.Model): class Tag(models.Model):
name = models.CharField(max_length=255, unique=True) name = models.CharField(max_length=255, unique=True, db_collation="numeric")
description = models.CharField(max_length=4096) description = models.CharField(max_length=4096, db_collation="numeric")
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
changed_at = models.DateTimeField(auto_now=True) changed_at = models.DateTimeField(auto_now=True)