tree: pad items in tree sort path

ergo · Feb 19, 2017 · fa052b5 · fa052b5
1 parent 7a70bfd
commit fa052b5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ziggurat_foundations/models/services/resource_tree_postgres.py b/ziggurat_foundations/models/services/resource_tree_postgres.py
@@ -33,12 +33,12 @@ def from_resource_deeper(cls, resource_id=None, limit_depth=1000000,
         tablename = cls.model.__table__.name
         raw_q = """
             WITH RECURSIVE subtree AS (
-                    SELECT res.*, 1 AS depth, res.ordering::CHARACTER VARYING AS sorting,
+                    SELECT res.*, 1 AS depth, LPAD(res.ordering::CHARACTER VARYING, 7, '0') AS sorting,
                     res.resource_id::CHARACTER VARYING AS path
                     FROM {tablename} AS res WHERE res.resource_id = :resource_id
                   UNION ALL
                     SELECT res_u.*, depth+1 AS depth,
-                    (st.sorting::CHARACTER VARYING || '/' || res_u.ordering::CHARACTER VARYING ) AS sorting,
+                    (st.sorting::CHARACTER VARYING || '/' || LPAD(res_u.ordering::CHARACTER VARYING, 7, '0') ) AS sorting,
                     (st.path::CHARACTER VARYING || '/' || res_u.resource_id::CHARACTER VARYING ) AS path
                     FROM {tablename} res_u, subtree st
                     WHERE res_u.parent_id = st.resource_id
@@ -106,12 +106,12 @@ def from_parent_deeper(cls, parent_id=None, limit_depth=1000000,
         tablename = cls.model.__table__.name
         raw_q = """
             WITH RECURSIVE subtree AS (
-                    SELECT res.*, 1 AS depth, res.ordering::CHARACTER VARYING AS sorting,
+                    SELECT res.*, 1 AS depth, LPAD(res.ordering::CHARACTER VARYING, 7, '0') AS sorting,
                     res.resource_id::CHARACTER VARYING AS path
                     FROM {tablename} AS res WHERE {limiting_clause}
                   UNION ALL
                     SELECT res_u.*, depth+1 AS depth,
-                    (st.sorting::CHARACTER VARYING || '/' || res_u.ordering::CHARACTER VARYING ) AS sorting,
+                    (st.sorting::CHARACTER VARYING || '/' || LPAD(res_u.ordering::CHARACTER VARYING, 7, '0') ) AS sorting,
                     (st.path::CHARACTER VARYING || '/' || res_u.resource_id::CHARACTER VARYING ) AS path
                     FROM {tablename} res_u, subtree st
                     WHERE res_u.parent_id = st.resource_id