fix #6846

qgis · Dec 10, 2012 · 34a16e2 · 34a16e2
1 parent b6c999e
commit 34a16e2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
@@ -191,18 +191,20 @@ def fillColumnCombos(self):
 		connector = self.db.connector
 		sql = u"SELECT * FROM (%s\n) AS %s LIMIT 0" % ( unicode(query), connector.quoteId(alias) )
 
+		c = None
 		try:
 			c = connector._execute(None, sql)
 			cols = connector._get_cursor_columns(c)
 
-		except BaseError, e:
+		except (BaseError, Warning) as e:
 			QApplication.restoreOverrideCursor()
 			DlgDbError.showError(e, self)
 			return
 
 		finally:
-			c.close()
-			del c
+			if c:
+				c.close()
+				del c
 
 		cols.sort()
 		self.uniqueCombo.addItems( cols )