diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-05 19:48:37 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-06 17:30:14 +0200 |
| commit | 207289f8f04523f9105ef187804caee2e8c6a7b6 (patch) | |
| tree | 7e84e80c80e3b3a49fc5afe00ac762818201a0a1 /src | |
| parent | 03a21b930f8557e48965c58543aaaddd646c2a38 (diff) | |
gen_query_create_from_link_map(): use q_arr, switch to dict return object
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/db_op.py | 8 | ||||
| -rw-r--r-- | src/server/neo4j_util.py | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index 259f5892..7d7f4a98 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -359,8 +359,7 @@ class DBO_attr_diff_commit(DB_op): q_arr.insert(1, stmt_attr_set) q_param_set['attr_set'] = w_attr_set - q = " ".join(q_arr) - self.add_statement(q, q_param_set) + self.add_statement(q_arr, q_param_set) for id_attr, n_attr_diff in attr_diff.type__link.items(): r_attr_set = n_attr_diff['__attr_remove'] @@ -389,8 +388,7 @@ class DBO_attr_diff_commit(DB_op): q_arr.insert(1, stmt_attr_set) q_param_set['attr_set'] = w_attr_set - q = " ".join(q_arr) - self.add_statement(q, q_param_set) + self.add_statement(q_arr, q_param_set) blob = json.dumps(attr_diff) chain_commit_op = DBO_block_chain__commit(blob) @@ -485,7 +483,7 @@ class DBO_load_link_set(DB_op): This class should be instantiated through a static factory function - @link_ptr_set link pointer set + @param link_ptr_set link pointer set @return: a set of loaded links """ super(DBO_load_link_set, self).__init__() diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py index 3849cdef..7695ac69 100644 --- a/src/server/neo4j_util.py +++ b/src/server/neo4j_util.py @@ -212,10 +212,13 @@ def gen_query_create_from_link_map(link_map, input_to_DB_property_map=lambda _: ret = [] for l_type, l_set in link_map.items(): - q = "match (src {id: {src}.id}),(dst {id: {dst}.id}) " + \ - "create (src)-[r:%(__type)s {link_attr}]->(dst) " + \ - "return r, src.id, dst.id, type(r)" - q = q % {'__type': quote__backtick(l_type)} + + assert len(l_type) > 2 and l_type[0].isupper(), 'malformed label: ' + l_type + + 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)}', + ] for link in l_set: __type_check_link(link) @@ -231,7 +234,7 @@ def gen_query_create_from_link_map(link_map, input_to_DB_property_map=lambda _: q_params = {'src': { 'id': src_id} , 'dst': { 'id': dst_id} , 'link_attr' : input_to_DB_property_map(prop_dict)} - ret.append((q, q_params)) + ret.append((q_arr, q_params)) return ret |