diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-06 15:00:48 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-06 17:30:14 +0200 |
| commit | 7d058fcb630586509930be6a012be87d5ef96378 (patch) | |
| tree | 89fc150c137607d21dbbc529de89eca62197348c /src | |
| parent | 625850dd1f18f72454e9bbbe0a2e6e68edee4802 (diff) | |
DBO_add_node_set, DBO_add_link_set: order returned list by id
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/db_op.py | 2 | ||||
| -rw-r--r-- | src/server/neo4j_util.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index 22800953..26f2518b 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -389,7 +389,7 @@ class DBO_diff_commit__attr(DB_op): blob = json.dumps(attr_diff) chain_commit_op = DBO_block_chain__commit(blob) for db_q in chain_commit_op.statement_set: - self.add_statement(db_q) + self.add_db_query(db_q) def add_link_rename_statements(self, id_attr, new_label): # TODO - where do we sanitize the label name? any better way of doing this? diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py index ee047b69..568be104 100644 --- a/src/server/neo4j_util.py +++ b/src/server/neo4j_util.py @@ -207,7 +207,9 @@ def gen_query_create_from_node_map(node_map, input_to_DB_property_map=lambda _: assert len(label) > 2 and label[0].isupper(), 'malformed label: ' + label q_arr = ['create (n:%s {node_attr})' % (quote__backtick(label)), - 'return {id: n.id, label_set: labels(n)}' + 'with n', + 'order by n.id', + 'return {id: n.id, __label_set: labels(n)}' ] q_params_set = [] @@ -237,7 +239,9 @@ def gen_query_create_from_link_map(link_map, input_to_DB_property_map=lambda _: q_arr = ['match (src {id: {src}.id}),(dst {id: {dst}.id})', 'create (src)-[r:%(__type)s {link_attr}]->(dst)' % {'__type': quote__backtick(l_type)}, - 'return { id: r.id, src_id: src.id, dst_id: dst.id, type: type(r)}', + 'with r, src, dst', + 'order by r.id', + 'return { id: r.id, __src_id: src.id, __dst_id: dst.id, __type: type(r)}', ] for link in l_set: |