diff options
| author | Aymeric Augustin | 2014-04-03 19:34:36 +0200 | 
|---|---|---|
| committer | Aymeric Augustin | 2014-04-03 19:35:55 +0200 | 
| commit | c6a67bbed0c9853a9f9d67c6f55f4a06f9af45b7 (patch) | |
| tree | 20366afc92b3fa1397119f32af46fe947e92a704 /debug_toolbar/panels/sql/tracking.py | |
| parent | 69d70bfd585403b5490479c1a41b1ddcb7af850f (diff) | |
| download | django-debug-toolbar-c6a67bbed0c9853a9f9d67c6f55f4a06f9af45b7.tar.bz2 | |
Fix #571 -- Improve database engine detection.
Diffstat (limited to 'debug_toolbar/panels/sql/tracking.py')
| -rw-r--r-- | debug_toolbar/panels/sql/tracking.py | 10 | 
1 files changed, 3 insertions, 7 deletions
| diff --git a/debug_toolbar/panels/sql/tracking.py b/debug_toolbar/panels/sql/tracking.py index 68c77e2..b6a787d 100644 --- a/debug_toolbar/panels/sql/tracking.py +++ b/debug_toolbar/panels/sql/tracking.py @@ -131,14 +131,10 @@ class NormalCursorWrapper(object):              alias = getattr(self.db, 'alias', 'default')              conn = self.db.connection -            # HACK: avoid imports -            if conn: -                engine = conn.__class__.__module__.split('.', 1)[0] -            else: -                engine = 'unknown' +            vendor = getattr(conn, 'vendor', 'unknown')              params = { -                'engine': engine, +                'vendor': vendor,                  'alias': alias,                  'sql': self.db.ops.last_executed_query(                      self.cursor, sql, self._quote_params(params)), @@ -153,7 +149,7 @@ class NormalCursorWrapper(object):                  'template_info': template_info,              } -            if engine == 'psycopg2': +            if vendor == 'postgresql':                  # If an erroneous query was ran on the connection, it might                  # be in a state where checking isolation_level raises an                  # exception. | 
