My favorites | Sign in
Project Home Downloads Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 26 attachment: tree_order_patch.diff (10.0 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
Index: mptt/managers.py
===================================================================
--- mptt/managers.py (revision 121)
+++ mptt/managers.py (working copy)
@@ -34,7 +34,7 @@
A manager for working with trees of objects.
"""
def __init__(self, parent_attr, left_attr, right_attr, tree_id_attr,
- level_attr):
+ level_attr, tree_order_attr):
"""
Tree attributes for the model being managed are held as
attributes of this manager for later use, since it will be using
@@ -46,6 +46,7 @@
self.right_attr = right_attr
self.tree_id_attr = tree_id_attr
self.level_attr = level_attr
+ self.tree_order_attr = tree_order_attr

def add_related_count(self, queryset, rel_model, rel_field, count_attr,
cumulative=False):
@@ -121,11 +122,13 @@
raise ValueError(_('Cannot insert a node which has already been saved.'))

if target is None:
+ newtree = self._get_next_tree_id()
setattr(node, self.left_attr, 1)
setattr(node, self.right_attr, 2)
setattr(node, self.level_attr, 0)
- setattr(node, self.tree_id_attr, self._get_next_tree_id())
+ setattr(node, self.tree_id_attr, newtree)
setattr(node, self.parent_attr, None)
+ setattr(node, self.tree_order_attr, '%04d0001' % (newtree,))
elif target.is_root_node() and position in ['left', 'right']:
target_tree_id = getattr(target, self.tree_id_attr)
if position == 'left':
@@ -142,6 +145,7 @@
setattr(node, self.level_attr, 0)
setattr(node, self.tree_id_attr, tree_id)
setattr(node, self.parent_attr, None)
+ setattr(node, self.tree_order_attr, '%04d0001' % (tree_id,))
else:
setattr(node, self.left_attr, 0)
setattr(node, self.level_attr, 0)
@@ -157,6 +161,7 @@
setattr(node, self.level_attr, -level)
setattr(node, self.tree_id_attr, tree_id)
setattr(node, self.parent_attr, parent)
+ setattr(node, self.tree_order_attr, '%04d%04d' % (tree_id, -left,))

if commit:
node.save()
@@ -253,6 +258,33 @@
"""
self._manage_space(size, target, tree_id)

+
+ def _update_tree_order(self, lower_tree_id, upper_tree_id=None):
+ """
+ Updates the tree_order field for a range of trees. Takes the values
+ from the existing tree_id, level, and lft values. Should be run after
+ any updates to a tree, movin a node, etc.
+ """
+ #make sure that upper = lower if no lower, and that lower is < upper
+ upper_tree_id = lower_tree_id if not upper_tree_id else upper_tree_id
+ if upper_tree_id < lower_tree_id:
+ upper_tree_id, lower_tree_id = lower_tree_id, upper_tree_id
+
+ opts = self.model._meta
+ update_order_query = """
+ UPDATE %(table)s
+ SET %(tree_order)s = concat(trim(to_char(%(tree_id)s, '0000')), trim(to_char(%(left)s, '0000')))
+ WHERE %(tree_id)s >= %%s AND %(tree_id)s <= %%s""" % {
+ 'table': qn(opts.db_table),
+ 'left': qn(opts.get_field(self.left_attr).column),
+ 'tree_id': qn(opts.get_field(self.tree_id_attr).column),
+ 'tree_order': qn(opts.get_field(self.tree_order_attr).column),
+ }
+
+ cursor = connection.cursor()
+ cursor.execute(update_order_query, [lower_tree_id, upper_tree_id,])
+
+
def _create_tree_space(self, target_tree_id):
"""
Creates space for a new tree by incrementing all tree ids
@@ -267,6 +299,7 @@
'table': qn(opts.db_table),
'tree_id': qn(opts.get_field(self.tree_id_attr).column),
}, [target_tree_id])
+ self._update_tree_order(target_tree_id, 9999999)

def _get_next_tree_id(self):
"""
@@ -281,6 +314,7 @@
row = cursor.fetchone()
return row[0] and (row[0] + 1) or 1

+
def _inter_tree_move_and_close_gap(self, node, level_change,
left_right_change, new_tree_id, parent_pk=None):
"""
@@ -330,9 +364,9 @@
'pk': qn(opts.pk.column),
'new_parent': parent_pk is None and 'NULL' or '%s',
}
-
left = getattr(node, self.left_attr)
right = getattr(node, self.right_attr)
+ tree_id = getattr(node, self.tree_id_attr)
gap_size = right - left + 1
gap_target_left = left - 1
params = [
@@ -343,12 +377,15 @@
left, right, left_right_change,
gap_target_left, gap_size,
node.pk,
- getattr(node, self.tree_id_attr)
+ tree_id
]
+
if parent_pk is not None:
params.insert(-1, parent_pk)
+
cursor = connection.cursor()
cursor.execute(inter_tree_move_query, params)
+ self._update_tree_order(new_tree_id, tree_id)

def _make_child_root_node(self, node, new_tree_id=None):
"""
@@ -379,6 +416,7 @@
setattr(node, self.level_attr, 0)
setattr(node, self.tree_id_attr, new_tree_id)
setattr(node, self.parent_attr, None)
+ setattr(node, self.tree_order_attr, '%04d%04d' % (new_tree_id, left - left_right_change,))

def _make_sibling_of_root_node(self, node, target, position):
"""
@@ -456,10 +494,12 @@
'table': qn(opts.db_table),
'tree_id': qn(opts.get_field(self.tree_id_attr).column),
}
+ print 'making sibling of root'
cursor = connection.cursor()
cursor.execute(root_sibling_query, [tree_id, new_tree_id, shift,
lower_bound, upper_bound])
setattr(node, self.tree_id_attr, new_tree_id)
+ self._update_tree_order(lower_bound, upper_bound)

def _manage_space(self, size, target, tree_id):
"""
@@ -489,6 +529,8 @@
cursor.execute(space_query, [target, size, target, size, tree_id,
target, target])

+ self._update_tree_order(tree_id)
+
def _move_child_node(self, node, target, position):
"""
Calls the appropriate method to move child node ``node``
@@ -540,6 +582,7 @@
setattr(node, self.level_attr, level - level_change)
setattr(node, self.tree_id_attr, new_tree_id)
setattr(node, self.parent_attr, parent)
+ setattr(node, self.tree_order_attr, '%04d%04d' % (new_tree_id, left - left_right_change,))

def _move_child_within_tree(self, node, target, position):
"""
@@ -657,13 +700,17 @@
node.pk, parent.pk,
tree_id])

+ self._update_tree_order(tree_id)
+
# Update the node to be consistent with the updated
# tree in the database.
setattr(node, self.left_attr, new_left)
setattr(node, self.right_attr, new_right)
setattr(node, self.level_attr, level - level_change)
setattr(node, self.parent_attr, parent)
+ setattr(node, self.tree_order_attr, '%04d%04d' % (tree_id, new_left,))

+
def _move_root_node(self, node, target, position):
"""
Moves root node``node`` to a different tree, inserting it
@@ -718,6 +765,8 @@
left_right_change, new_tree_id, node.pk, parent.pk, left, right,
tree_id])

+ self._update_tree_order(tree_id, new_tree_id)
+
# Update the former root node to be consistent with the updated
# tree in the database.
setattr(node, self.left_attr, left - left_right_change)
@@ -725,3 +774,5 @@
setattr(node, self.level_attr, level - level_change)
setattr(node, self.tree_id_attr, new_tree_id)
setattr(node, self.parent_attr, parent)
+ setattr(node, self.tree_order_attr, '%04d%04d' % (new_tree_id, left - left_right_change,))
+
Index: mptt/__init__.py
===================================================================
--- mptt/__init__.py (revision 121)
+++ mptt/__init__.py (working copy)
@@ -12,7 +12,7 @@

def register(model, parent_attr='parent', left_attr='lft', right_attr='rght',
tree_id_attr='tree_id', level_attr='level',
- tree_manager_attr='tree', order_insertion_by=None):
+ tree_manager_attr='tree', tree_order_attr='tree_order', order_insertion_by=None):
"""
Sets the given model class up for Modified Preorder Tree Traversal.
"""
@@ -22,7 +22,7 @@
from django.utils.functional import wraps # Python 2.3, 2.4 fallback

from django.db.models import signals as model_signals
- from django.db.models import FieldDoesNotExist, PositiveIntegerField
+ from django.db.models import FieldDoesNotExist, PositiveIntegerField, CharField
from django.utils.translation import ugettext as _

from mptt import models
@@ -42,6 +42,7 @@
opts.tree_id_attr = tree_id_attr
opts.level_attr = level_attr
opts.tree_manager_attr = tree_manager_attr
+ opts.tree_order_attr = tree_order_attr
opts.order_insertion_by = order_insertion_by

# Add tree fields if they do not exist
@@ -52,6 +53,13 @@
PositiveIntegerField(
db_index=True, editable=False).contribute_to_class(model, attr)

+ #For the tree_order field:
+ try:
+ opts.get_field(tree_order_attr)
+ except FieldDoesNotExist:
+ CharField(max_length=12, null=True, blank=True,
+ db_index=True, editable=False).contribute_to_class(model, tree_order_attr)
+
# Add tree methods for model instances
setattr(model, 'get_ancestors', models.get_ancestors)
setattr(model, 'get_children', models.get_children)
@@ -69,7 +77,7 @@

# Add a custom tree manager
TreeManager(parent_attr, left_attr, right_attr, tree_id_attr,
- level_attr).contribute_to_class(model, tree_manager_attr)
+ level_attr, tree_order_attr).contribute_to_class(model, tree_manager_attr)
setattr(model, '_tree_manager', getattr(model, tree_manager_attr))

# Set up signal receiver to manage the tree when instances of the
Powered by Google Project Hosting