Merge pull request #1235 from kjkuan/avoid-query-per-row-for-virtual-fields

Avoid issuing a separate sql query for each row in sqlform grid search results, for virtual fields
2016-03-24 12:09:36 -05:00
parent 6ed204301d 6d68a40ddf
commit a6a9b004ea
1 changed files with 5 additions and 1 deletions
@@ -2743,7 +2743,11 @@ class SQLFORM(FORM):
                    if field.type == 'blob':
                        continue
                    if isinstance(field, Field.Virtual) and field.tablename in row:
-                        value = dbset.db[field.tablename][row[field.tablename][field_id]][field.name]
+                        try:
+                            # fast path, works for joins
+                            value = row[field.tablename][field.name]
+                        except KeyError:
+                            value = dbset.db[field.tablename][row[field.tablename][field_id]][field.name]
                    else:
                        value = row[str(field)]
                    maxlength = maxtextlengths.get(str(field), maxtextlength)