From 5f07a332844b4641be9fd41d9596188182671d7d Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 23 Mar 2015 16:56:09 +0200 Subject: DB_op: follow q_arr naming convention --- src/server/db_op.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/server/db_op.py') diff --git a/src/server/db_op.py b/src/server/db_op.py index 070589d6..15e7951e 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -518,8 +518,10 @@ class DBO_load_node_set_by_DB_id(DB_op): @return: loaded node set or an empty set if no match was found """ super(DBO_load_node_set_by_DB_id, self).__init__() - q = "start n=node({id_set}) return n" - self.add_statement(q, { 'id_set': id_set}) + q_arr = ['start n=node({id_set})', + 'return n' + ] + self.add_statement(q_arr, { 'id_set': id_set}) class DBO_match_node_id_set(DB_op): @@ -567,16 +569,22 @@ class DBO_load_link_set(DB_op): for l_ptr in link_ptr_set: if not l_ptr.src_id: - q = "match ()-[r]->({id: {dst_id}}) return r" + q_arr = ['match ()-[r]->({id: {dst_id}})', + 'return r' + ] q_params = {'dst_id': l_ptr.dst_id} elif not l_ptr.dst_id: - q = "match ({id: {src_id}})-[r]->() return r" + q_arr = ['match ({id: {src_id}})-[r]->()', + 'return r' + ] q_params = {'src_id': l_ptr.src_id} else: - q = "match ({id: {src_id}})-[r]->({id: {dst_id}}) return r" + q_arr = ['match ({id: {src_id}})-[r]->({id: {dst_id}})', + 'return r' + ] q_params = {'src_id': l_ptr.src_id, 'dst_id': l_ptr.dst_id} - self.add_statement(q, q_params) + self.add_statement(q_arr, q_params) @staticmethod def init_from_link_ptr(l_ptr): -- cgit v1.3.1