From d960513ef2838fabed1bbecc4372cfd82e577efc Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sat, 26 Oct 2013 21:46:48 -0500 Subject: [PATCH] fixed issues 1742:dal Teradata connection issue. cursors not being closed at the end of sessions, thanks awilliman01 --- VERSION | 2 +- applications/welcome/static/js/web2py.js | 2 +- gluon/dal.py | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 6b5b0d66..31a2939f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.10.23.20.12.15 +Version 2.7.4-stable+timestamp.2013.10.26.21.45.59 diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index 157d46fb..cacf74da 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -513,7 +513,7 @@ if(flash.html()) flash.append(' × ').slideDown(); }, hide_flash: function () { - $('.flash').hide().html(''); + $('.flash').fadeOut(0).html(''); }, show_if_handler: function (target) { var triggers = {}; diff --git a/gluon/dal.py b/gluon/dal.py index f7dfbfaf..41a1b29d 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4046,6 +4046,12 @@ class TeradataAdapter(BaseAdapter): self.connector = connector if do_connect: self.reconnect() + def close(self,action='commit',really=True): + # Teradata does not implicitly close off the cursor + # leading to SQL_ACTIVE_STATEMENTS limit errors + self.cursor.close() + ConnectionPool.close(self, action, really) + def LEFT_JOIN(self): return 'LEFT OUTER JOIN'