From 6a5c1acbeca40a374736d657d48beb33f0d32b27 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Sun, 12 Oct 2014 14:40:12 +0200 Subject: support result_set iteration post DB_op execution --- src-py/db_controller.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src-py/db_controller.py') diff --git a/src-py/db_controller.py b/src-py/db_controller.py index 180a6b37..3969a2bb 100644 --- a/src-py/db_controller.py +++ b/src-py/db_controller.py @@ -40,15 +40,22 @@ class DB_op(object): def __iter__(self): """ - iterate over (statement_index, statement, statement_result) + iterate over (statement_index, statement, result, error) + where result & error are mutually exclusive + note: statement_index is zero based - TODO: support statement_result + TODO: handle partial iteration due to error_set being non-empty """ i = 0 - for s in self.statement_set: - yield (i, s, None) - i = i + 1 + if self.result_set: + for s in self.statement_set: + yield (i, s, self.result_set[i]) + i = i + 1 + else: + for s in self.statement_set: + yield (i, s, None) + i = i + 1 def extract_single_query_response_data(self, q, data): """ -- cgit v1.3.1