From e482cba237e2a013feb2778423fb2dced6cc8743 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 16 Nov 2013 03:54:30 -0600 Subject: [PATCH] minor dal rewrite in real_referenced --- VERSION | 2 +- gluon/dal.py | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index cfe35b9b..b4cc2024 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.11.16.03.38.41 +Version 2.7.4-stable+timestamp.2013.11.16.03.53.15 diff --git a/gluon/dal.py b/gluon/dal.py index 2f58291e..57e6d400 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -911,14 +911,11 @@ class BaseAdapter(ConnectionPool): #references to tablenames without rname to make #migrations and model relationship work also if tables #are not defined in order - if referenced == tablename: - real_referenced = db[referenced]._rname or db[referenced] - else: - real_referenced = ( - referenced in db and - (db[referenced]._rname or db[referenced]) - or referenced - ) + real_referenced = ( + (db[referenced]._rname or db[referenced]) + if referenced == tablename or referenced in db + else referenced) + ftype = types[field_type[:9]] % dict( index_name = field_name+'__idx', field_name = field._rname or field.name,