else:
table_rows = table.iterrows()
+ # Prepare rows
if len(fields) == 1 and fields[0] == 'count(*)':
- rows.append(Row({'count(*)': table.nrows}))
+ rows.append(Row({fields[0]: table.nrows}))
else:
for table_row in table_rows:
row = Row()
row[field] = table_row.nrow
elif field == '*':
for col in table.colnames:
- row[col] = table_row[col]
+ value = table_row[col]
+ if type(value) is bytes:
+ value = value.decode('utf-8')
+ row[col] = value
else:
row[field] = table_row[field]
rows.append(row)
- description = ((col,) for col in table.colnames)
+ # Prepare query description
+ for field in fields:
+ if field == '*':
+ for col in table.colnames:
+ description.append((col,))
+ else:
+ description.append((field,))
if truncate:
- return rows, truncated, description
+ return rows, truncated, tuple(description)
else:
return rows
def __getitem__(self, label):
if type(label) is int:
return super(OrderedDict, self).__getitem__(list(self.keys())[label])
+ else:
+ return super(OrderedDict, self).__getitem__(label)
+
+ def __iter__(self):
+ return self.values().__iter__()