From 4bfa9c1686a83983239bbf8ecdd13c5b50f877ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonel=20C=C3=A2mara?= <leonelcamara@gmail.com>
Date: Wed, 8 Nov 2017 22:21:51 +0000
Subject: [PATCH] Fix a problem with Expressions in SQLTABLE possibly fixes
 #1735 and fixes web2py/pydal#487

---
 gluon/sqlhtml.py            | 2 +-
 gluon/tests/test_sqlhtml.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index afb2279e..594339dd 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -3328,7 +3328,7 @@ class SQLTABLE(TABLE):
             return
         REGEX_TABLE_DOT_FIELD = sqlrows.db._adapter.REGEX_TABLE_DOT_FIELD
         fieldmap = dict(zip(sqlrows.colnames, sqlrows.fields))
-        tablemap = dict(((f.tablename, f.table) for f in fieldmap.values()))
+        tablemap = dict(((f.tablename, f.table) if isinstance(f, Field) else (f._table._tablename, f._table) for f in fieldmap.values()))
         for table in tablemap.values():
             pref = table._tablename + '.'
             fieldmap.update(((pref+f.name, f) for f in table._virtual_fields))
diff --git a/gluon/tests/test_sqlhtml.py b/gluon/tests/test_sqlhtml.py
index d0b519a0..1ba9b051 100644
--- a/gluon/tests/test_sqlhtml.py
+++ b/gluon/tests/test_sqlhtml.py
@@ -355,10 +355,10 @@ class TestSQLTABLE(unittest.TestCase):
 
         self.db.commit()
 
-#    def test_SQLTABLE(self):
-#        rows = self.db(self.db.auth_user.id > 0).select(self.db.auth_user.ALL)
-#        sqltable = SQLTABLE(rows)
-#        self.assertEqual(sqltable.xml(), '<table><thead><tr><th>auth_user.id</th><th>auth_user.first_name</th><th>auth_user.last_name</th><th>auth_user.email</th><th>auth_user.username</th><th>auth_user.password</th><th>auth_user.registration_key</th><th>auth_user.reset_password_key</th><th>auth_user.registration_id</th></tr></thead><tbody><tr class="w2p_odd odd"><td>1</td><td>Bart</td><td>Simpson</td><td>user1@test.com</td><td>user1</td><td>password_123</td><td>None</td><td></td><td>None</td></tr></tbody></table>')
+    def test_SQLTABLE(self):
+        rows = self.db(self.db.auth_user.id > 0).select(self.db.auth_user.ALL)
+        sqltable = SQLTABLE(rows)
+        self.assertEqual(sqltable.xml(), b'<table><thead><tr><th>auth_user.id</th><th>auth_user.first_name</th><th>auth_user.last_name</th><th>auth_user.email</th><th>auth_user.username</th><th>auth_user.password</th><th>auth_user.registration_key</th><th>auth_user.reset_password_key</th><th>auth_user.registration_id</th></tr></thead><tbody><tr class="w2p_odd odd"><td>1</td><td>Bart</td><td>Simpson</td><td>user1@test.com</td><td>user1</td><td>password_123</td><td>None</td><td></td><td>None</td></tr></tbody></table>')
 
 
 # class TestExportClass(unittest.TestCase):