From 44d5ff26a481040882d81f4d644dcf65732ebec8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 19 Dec 2016 11:01:44 -0500 Subject: [PATCH] Fixes #747: Fixes natural_order_by integer cast error on large numbers --- netbox/utilities/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/managers.py b/netbox/utilities/managers.py index 1235a21d1..5b6138d30 100644 --- a/netbox/utilities/managers.py +++ b/netbox/utilities/managers.py @@ -21,9 +21,9 @@ class NaturalOrderByManager(Manager): id3 = '_{}_{}3'.format(db_table, primary_field) 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), - 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)