[MERGE] merge with latest stable

[odoo/odoo.git] / bin / sql_db.py

diff --git a/bin/sql_db.py b/bin/sql_db.py
index 6c2c17b..b1822f6 100644 (file)
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -3,6 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -28,6 +29,7 @@ from psycopg2.psycopg1 import cursor as psycopg1cursor
 from psycopg2.pool import PoolError
 
 import psycopg2.extensions
+import warnings
 
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 
@@ -51,11 +53,12 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,)
 
 
 import tools
-from tools.func import wraps
+from tools.func import wraps, frame_codeinfo
+from netsvc import Agent
 from datetime import datetime as mdt
 from datetime import timedelta
 import threading
-from inspect import stack
+from inspect import currentframe
 
 import re
 re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$');
@@ -71,7 +74,7 @@ class Cursor(object):
         @wraps(f)
         def wrapper(self, *args, **kwargs):
             if self.__closed:
-                raise psycopg2.ProgrammingError('Unable to use the cursor after having closed it')
+                raise psycopg2.OperationalError('Unable to use the cursor after having closed it')
             return f(self, *args, **kwargs)
         return wrapper
 
@@ -93,7 +96,10 @@ class Cursor(object):
         self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
         self.__closed = False   # real initialisation value
         self.autocommit(False)
-        self.__caller = tuple(stack()[2][1:3])
+        if self.sql_log:
+            self.__caller = frame_codeinfo(currentframe(),2)
+        else:
+            self.__caller = False
 
     def __del__(self):
         if not self.__closed:
@@ -102,9 +108,12 @@ class Cursor(object):
             # but the database connection is not put back into the connection
             # pool, preventing some operation on the database like dropping it.
             # This can also lead to a server overload.
-            msg = "Cursor not closed explicitly\n"  \
-                  "Cursor was created at %s:%s"
-            self.__logger.warn(msg, *self.__caller)
+            msg = "Cursor not closed explicitly\n"
+            if self.__caller:
+                msg += "Cursor was created at %s:%s" % self.__caller
+            else:
+                msg += "Please enable sql debugging to trace the caller."
+            self.__logger.warn(msg)
             self._close(True)
 
     @check
@@ -121,11 +130,11 @@ class Cursor(object):
             params = params or None
             res = self._obj.execute(query, params)
         except psycopg2.ProgrammingError, pe:
-            if log_exceptions or self.sql_log:
+            if log_exceptions:
                 self.__logger.error("Programming error: %s, in query %s", pe, query)
             raise
         except Exception:
-            if log_exceptions or self.sql_log:
+            if log_exceptions:
                 self.__logger.exception("bad query: %s", self._obj.query or query)
             raise
 
@@ -290,7 +299,11 @@ class ConnectionPool(object):
                 # note: this code is called only if the for loop has completed (no break)
                 raise PoolError('The Connection Pool Is Full')
 
-        result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
+        try:
+            result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
+        except psycopg2.Error, e:
+            self.__logger.exception('Connection to the database failed')
+            raise
         self._connections.append((result, True))
         self._debug('Create new connection')
         return result
@@ -337,10 +350,12 @@ class Connection(object):
     def __nonzero__(self):
         """Check if connection is possible"""
         try:
+            warnings.warn("You use an expensive function to test a connection.",
+                      DeprecationWarning, stacklevel=1)
             cr = self.cursor()
             cr.close()
             return True
-        except:
+        except Exception:
             return False
 
 
@@ -369,6 +384,7 @@ def db_connect(db_name):
 
 def close_db(db_name):
     _Pool.close_all(dsn(db_name))
+    Agent.cancel(db_name)
     tools.cache.clean_caches_for_db(db_name)
     ct = currentThread()
     if hasattr(ct, 'dbname'):