diff options
| -rw-r--r-- | src/server/db_op.py | 9 | ||||
| -rw-r--r-- | src/server/neo4j_util.py | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/server/db_op.py b/src/server/db_op.py index 712123e0..b6c31a47 100644 --- a/src/server/db_op.py +++ b/src/server/db_op.py @@ -796,18 +796,19 @@ class DBO_rzdoc__delete(DB_op): """ super(DBO_rzdoc__delete, self).__init__() - rzdoc_label = rzdoc__ns_label(rzdoc) + rzdoc_label_q = quote__singlequote(rzdoc__ns_label(rzdoc)) + rzdoc_id_q = quote__singlequote(rzdoc.id) # delete doc nodes & links - q_arr = ['match (n:%s)' % (rzdoc_label), - 'optional match (n:%s)-[r]-()' % (rzdoc_label), + q_arr = ['match (n:%s)' % (rzdoc_label_q), + 'optional match (n:%s)-[r]-()' % (rzdoc_label_q), 'delete r,n'] db_q = DB_Query(q_arr) self.add_db_query(db_q) # delete doc meta node q_arr = ['match (n:%s {id: %s})' % (neo4j_schema.META_LABEL__RZDOC_TYPE, - quote__singlequote(rzdoc.id)), + rzdoc_id_q), 'optional match (n)-[r]-()', 'delete r,n'] db_q = DB_Query(q_arr) diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py index b3f7a9b1..da9a454e 100644 --- a/src/server/neo4j_util.py +++ b/src/server/neo4j_util.py @@ -61,10 +61,16 @@ def cfmt(fmt_str, *args, **kwargs): return Cypher_String_Formatter().format(fmt_str, *args, **kwargs) def rzdoc__ns_label(rzdoc): - return quote__backtick(neo4j_schema.META_LABEL__RZDOC_NS_PREFIX + rzdoc.id) + """ + [!] must be quoted when used in queries + """ + return neo4j_schema.META_LABEL__RZDOC_NS_PREFIX + rzdoc.id -def rzdoc__meta_ns_label(rzdoc): - return quote__backtick(neo4j_schema.META_LABEL__RZDOC_NS_META_PREFIX + rzdoc.id) +def rzdoc__meta_ns_label(rzdoc): + """ + [!] must be quoted when used in queries + """ + return neo4j_schema.META_LABEL__RZDOC_NS_META_PREFIX + rzdoc.id def db_query_set_to_REST_form(db_query_set): """ |