sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #6842

Browse Source
This commit is contained in:
Giuseppe Sucameli 2012-12-10 01:16:38 +01:00
parent 0e1b71c82c
commit c203990ceb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/db_manager/db_plugins/connector.py
View File

@ -25,7 +25,7 @@ from PyQt4.QtGui import *
from qgis.core import QgsDataSourceURI
from .plugin import DbError, ConnectionError
from .plugin import BaseError, DbError, ConnectionError
class DBConnector:
def __init__(self, uri):
@ -75,10 +75,10 @@ class DBConnector:
try:
cursor.execute(unicode(sql))
except self.connection_error_types(), e:
except self.connection_error_types() as e:
raise ConnectionError(e)
except self.execution_error_types(), e:
except self.execution_error_types() as e:
# do the rollback to avoid a "current transaction aborted, commands ignored" errors
self._rollback()
raise DbError(e, sql)

2
python/plugins/db_manager/db_plugins/postgis/connector.py
View File

@ -866,7 +866,7 @@ class PostGisDBConnector(DBConnector):
def execution_error_types(self):
return psycopg2.Error, psycopg2.ProgrammingError
return psycopg2.Error, psycopg2.ProgrammingError, psycopg2.Warning
def connection_error_types(self):
return psycopg2.InterfaceError, psycopg2.OperationalError

2
python/plugins/db_manager/db_plugins/spatialite/connector.py
View File

@ -554,7 +554,7 @@ class SpatiaLiteDBConnector(DBConnector):
def execution_error_types(self):
return sqlite.Error, sqlite.ProgrammingError
return sqlite.Error, sqlite.ProgrammingError, sqlite.Warning
def connection_error_types(self):
return sqlite.InterfaceError, sqlite.OperationalError

2
python/plugins/db_manager/dlg_sql_window.py
View File

@ -196,7 +196,7 @@ class DlgSqlWindow(QDialog, Ui_Dialog):
c = connector._execute(None, sql)
cols = connector._get_cursor_columns(c)
except (BaseError, Warning) as e:
except BaseError as e:
QApplication.restoreOverrideCursor()
DlgDbError.showError(e, self)
return