Skip to content

added parameters support #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ result = redis_graph.query(query)
# Print resultset
result.pretty_print()

# Use parameters
params = {'purpose':"pleasure"}
query = """MATCH (p:person)-[v:visited {purpose:$purpose}]->(c:country)
RETURN p.name, p.age, v.purpose, c.name"""

result = redis_graph.query(query, params)

# Print resultset
result.pretty_print()


# Iterate through resultset
for record in result.result_set:
person_name = record[0]
Expand Down
20 changes: 19 additions & 1 deletion redisgraph/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,30 @@ def flush(self):
self.nodes = {}
self.edges = []

def query(self, q):
def build_params_header(self, params):
assert type(params) == dict
# Header starts with "CYPHER"
params_header = "CYPHER "
for key, value in params.items():
# If value is string add quotation marks.
if type(value) == str:
value = quote_string(value)
# Value is None, replace with "null" string.
elif value is None:
value = "null"
params_header += str(key) + "=" + str(value) + " "
return params_header

def query(self, q, params=None):
"""
Executes a query against the graph.
"""
if params is not None:
q = self.build_params_header(params) + q

statistics = None
result_set = None

response = self.redis_con.execute_command("GRAPH.QUERY", self.name, q, "--compact")
return QueryResult(self, response)

Expand Down
12 changes: 12 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@ def test_path(self):
# All done, remove graph.
redis_graph.delete()

def test_param(self):
redis_graph = Graph('params', self.r)

params = [1, 2.3, "str", True, False, None, [0, 1, 2]]
query = "RETURN $param"
for param in params:
result = redis_graph.query(query, {'param': param})
expected_results = [[param]]
self.assertEqual(expected_results, result.result_set)

# All done, remove graph.
redis_graph.delete()

if __name__ == '__main__':
unittest.main()