fix selected query (fixes #12429)

qgis · May 26, 2015 · b1dd253 · b1dd253
1 parent 1eac259
commit b1dd253
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
@@ -111,7 +111,8 @@ def updatePresetsCombobox(self):
         self.presetCombo.setCurrentIndex(-1)
 
     def storePreset(self):
-        query = self.editSql.text()
+        query = self._getSqlQuery()
+        if query == "": return
         name = self.presetName.text()
         QgsProject.instance().writeEntry('DBManager', 'savedQueries/q' + str(name.__hash__()) + '/name', name)
         QgsProject.instance().writeEntry('DBManager', 'savedQueries/q' + str(name.__hash__()) + '/query', query)
@@ -150,12 +151,8 @@ def clearSql(self):
 
     def executeSql(self):
 
-        sql = self.editSql.selectedText()
-        if len(sql) == 0:
-            sql = self.editSql.text()
-
-        if sql == "":
-            return
+        sql = self._getSqlQuery()
+        if sql == "": return
 
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 
@@ -198,9 +195,8 @@ def loadSqlLayer(self):
         else:
             geomFieldName = None
 
-        query = self.editSql.text()
-        if query == "":
-            return
+        query = self._getSqlQuery()
+        if query == "": return
 
         # remove a trailing ';' from query if present
         if query.strip().endswith(';'):
@@ -235,7 +231,7 @@ def loadSqlLayer(self):
         QApplication.restoreOverrideCursor()
 
     def fillColumnCombos(self):
-        query = self.editSql.text()
+        query = self._getSqlQuery()
         if query == "": return
 
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
@@ -351,4 +347,9 @@ def createView( self ):
             except BaseError as e:
                 DlgDbError.showError(e, self)
 
-
+    def _getSqlQuery(self):
+        sql = self.editSql.selectedText()
+        if len(sql) == 0:
+            sql = self.editSql.text()
+        return sql
+