From 1e8c9e89f32567a85bf7cb9e3bb9ef0e4e3fdec3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 1 Jul 2013 05:51:57 -0500 Subject: [PATCH] possibly fixed issue 1570:Recent web2py does no longer support table-aliasing, thanks Dominic --- VERSION | 2 +- gluon/dal.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 533b2fec..27121973 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.06.30.11.28.52 +Version 2.6.0-development+timestamp.2013.07.01.05.51.11 diff --git a/gluon/dal.py b/gluon/dal.py index a678c820..6c184b18 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8485,10 +8485,10 @@ class Table(object): def __str__(self): if self._ot is not None: - return self._db._adapter.QUOTE_TEMPLATE % self._ot - #if 'Oracle' in str(type(self._db._adapter)): # <<< patch - # return '%s %s' % (self._ot, self._tablename) # <<< patch - #return '%s AS %s' % (self._ot, self._tablename) + ot = self._db._adapter.QUOTE_TEMPLATE % self._ot + if 'Oracle' in str(type(self._db._adapter)): + return '%s %s' % (ot, self._tablename) + return '%s AS %s' % (ot, self._tablename) return self._tablename def _drop(self, mode = ''):