added support for newer newrelic

web2py · Mar 23, 2016 · bd5a767 · bd5a767
1 parent 824e330
commit bd5a767
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -7,7 +7,7 @@ Released on March 23rd 2016
 
 - Faster SQLite logic in absence of db queris
 - PEP8 improvements
-- Added support for new relic
+- Added support for new relic (newrelic>=2.10.0.8)
 - Added support for outerscoped tablenames
 - fixed Google Cloud SQL support
 - fixed Oracle DB support

diff --git a/pydal/adapters/postgres.py b/pydal/adapters/postgres.py
@@ -50,8 +50,8 @@ def varquote(self, name):
     def adapt(self, obj):
         if self.driver_name == 'psycopg2':
             adapted = psycopg2_adapt(obj)
-            # deal with new relic Connection Wrapper
-            cxn = getattr(self.connection,'_nr_connection',self.connection)
+            # deal with new relic Connection Wrapper (newrelic>=2.10.0.8)
+            cxn = getattr(self.connection,'__wrapped__',self.connection)
             adapted.prepare(cxn)
             rv = adapted.getquoted()
             if not PY2: