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

[DbManager] delete layer passed to querybuilder to set sql layer filter (follow f6e31613)

Browse Source
This commit is contained in:
Giuseppe Sucameli 2015-11-30 00:23:41 +01:00
parent 5408e843ec
commit c4dcb7b812
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
self.update()
QApplication.restoreOverrideCursor()
def _getSqlLayer(self):
def _getSqlLayer(self, _filter):
hasUniqueField = self.uniqueColumnCheck.checkState() == Qt.Checked
if hasUniqueField:
if self.allowMultiColumnPk:
@ -258,7 +258,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
# create the layer
layer = self.db.toSqlLayer(query, geomFieldName, uniqueFieldName, newLayerName, layerType,
self.avoidSelectById.isChecked(), self.filter)
self.avoidSelectById.isChecked(), _filter)
if layer.isValid():
return layer
else:
@ -266,16 +266,15 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
def loadSqlLayer(self):
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
layer = self._getSqlLayer()
QApplication.restoreOverrideCursor()
try:
layer = self._getSqlLayer(self.filter)
if layer == None:
return
if layer == None:
return
from qgis.core import QgsMapLayerRegistry
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
QgsMapLayerRegistry.instance().addMapLayers([layer], True)
QApplication.restoreOverrideCursor()
from qgis.core import QgsMapLayerRegistry
QgsMapLayerRegistry.instance().addMapLayers([layer], True)
finally:
QApplication.restoreOverrideCursor()
def fillColumnCombos(self):
query = self._getSqlQuery()
@ -460,18 +459,12 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
def setFilter(self):
from qgis.gui import QgsQueryBuilder
layer = self._getSqlLayer()
if layer == None:
# probably the defined filter does not work for the query, so try to create the layer without the filter
filter = self.filter
self.filter = ""
layer = self._getSqlLayer()
self.filter = filter
if layer == None:
return
layer = self._getSqlLayer("")
if not layer:
return
dlg = QgsQueryBuilder(layer)
dlg.setSql(self.filter)
if dlg.exec_():
self.filter = dlg.sql()
layer.deleteLater()