Parcourir la source

Fixes #747: Fixes natural_order_by integer cast error on large numbers

Jeremy Stretch il y a 8 ans
Parent
commit
44d5ff26a4
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      netbox/utilities/managers.py

+ 2 - 2
netbox/utilities/managers.py

@@ -21,9 +21,9 @@ class NaturalOrderByManager(Manager):
         id3 = '_{}_{}3'.format(db_table, primary_field)
         id3 = '_{}_{}3'.format(db_table, primary_field)
 
 
         queryset = super(NaturalOrderByManager, self).get_queryset().extra(select={
         queryset = super(NaturalOrderByManager, self).get_queryset().extra(select={
-            id1: "CAST(SUBSTRING({}.{} FROM '^(\d+)') AS integer)".format(db_table, primary_field),
+            id1: "CAST(SUBSTRING({}.{} FROM '^(\d{{1,9}})') AS integer)".format(db_table, primary_field),
             id2: "SUBSTRING({}.{} FROM '^\d*(.*?)\d*$')".format(db_table, primary_field),
             id2: "SUBSTRING({}.{} FROM '^\d*(.*?)\d*$')".format(db_table, primary_field),
-            id3: "CAST(SUBSTRING({}.{} FROM '(\d+)$') AS integer)".format(db_table, primary_field),
+            id3: "CAST(SUBSTRING({}.{} FROM '(\d{{1,9}})$') AS integer)".format(db_table, primary_field),
         })
         })
         ordering = fields[0:-1] + (id1, id2, id3)
         ordering = fields[0:-1] + (id1, id2, id3)