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

some minor code cleanup in dbmanager

Browse Source
This commit is contained in:
Etienne Trimaille 2019-02-04 18:53:04 -04:00 committed by Nyall Dawson
parent fd42980892
commit ac9c6f1e18
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/plugins/db_manager/dlg_import_vector.py
View File

@ -25,8 +25,7 @@ from builtins import str
from builtins import range
from qgis.PyQt.QtCore import Qt, QFileInfo
from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QApplication
from qgis.PyQt.QtGui import QCursor
from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox
from qgis.core import (QgsDataSourceUri,
QgsVectorLayer,

9
python/plugins/db_manager/dlg_sql_layer_window.py
View File

@ -88,7 +88,7 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
self.setWindowTitle(
u"%s - %s [%s]" % (self.windowTitle(), db.connection().connectionName(), db.connection().typeNameString()))
self.defaultLayerName = 'QueryLayer'
self.defaultLayerName = self.tr('QueryLayer')
if self.allowMultiColumnPk:
self.uniqueColumnCheck.setText(self.tr("Column(s) with unique values"))
@ -230,7 +230,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
def loadPreset(self, name):
query = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/query')[0]
name = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/name')[0]
self.editSql.setText(query)
def clearSql(self):
@ -252,7 +251,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
if old_model:
old_model.deleteLater()
cols = []
quotedCols = []
try:
@ -368,7 +366,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
query = query.strip()[:-1]
# get all the columns
cols = []
quotedCols = []
connector = self.db.connector
if self.aliasSubQuery:
@ -462,10 +459,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
items[0].setCheckState(Qt.Checked)
else:
self.uniqueCombo.setEditText(defaultUniqueCol)
try:
pass
except:
pass
def copySelectedResults(self):
if len(self.viewResult.selectedIndexes()) <= 0:

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

@ -73,7 +73,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
self.setWindowTitle(
self.tr(u"{0} - {1} [{2}]").format(self.windowTitle(), self.connectionName, self.dbType))
self.defaultLayerName = 'QueryLayer'
self.defaultLayerName = self.tr('QueryLayer')
if self.allowMultiColumnPk:
self.uniqueColumnCheck.setText(self.tr("Column(s) with unique values"))
@ -277,7 +277,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
def loadPreset(self, name):
query = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/query')[0]
name = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/name')[0]
self.editSql.setText(query)
def loadAsLayerToggled(self, checked):
@ -334,7 +333,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
with OverrideCursor(Qt.WaitCursor):
if self.modelAsync.task.status() == QgsTask.Complete:
model = self.modelAsync.model
cols = []
quotedCols = []
self.viewResult.setModel(model)
@ -351,7 +349,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
DlgDbError.showError(self.modelAsync.error, self)
self.uniqueModel.clear()
self.geomCombo.clear()
pass
def executeSql(self):
@ -452,7 +449,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
query = query.strip()[:-1]
# get all the columns
cols = []
quotedCols = []
connector = self.db.connector
if self.aliasSubQuery:
@ -546,10 +542,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
items[0].setCheckState(Qt.Checked)
else:
self.uniqueCombo.setEditText(defaultUniqueCol)
try:
pass
except:
pass
def copySelectedResults(self):
if len(self.viewResult.selectedIndexes()) <= 0:
@ -575,7 +567,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
dictionary = getSqlDictionary()
wordlist = []
for _, value in dictionary.items():
for value in dictionary.values():
wordlist += value # concat lists
wordlist = list(set(wordlist)) # remove duplicates