Skip to content

Commit 83baa91

Browse files
committed
[db manager] use QScintilla for SQL window
1 parent e6c2ecd commit 83baa91

File tree

4 files changed

+211
-221
lines changed

4 files changed

+211
-221
lines changed

python/plugins/db_manager/dlg_sql_window.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ def __init__(self, iface, db, parent=None):
5050
settings = QSettings()
5151
self.restoreGeometry(settings.value("/DB_Manager/sqlWindow/geometry", QByteArray(), type=QByteArray))
5252

53-
self.editSql.setAcceptRichText(False)
5453
self.editSql.setFocus()
55-
SqlCompleter(self.editSql, self.db)
56-
SqlHighlighter(self.editSql, self.db)
54+
self.editSql.initCompleter(self.db)
55+
#SqlCompleter(self.editSql, self.db)
56+
#SqlHighlighter(self.editSql, self.db)
5757

5858
# allow to copy results
5959
copyAction = QAction("copy", self)
@@ -95,7 +95,7 @@ def updatePresetsCombobox(self):
9595
self.presetCombo.setCurrentIndex(-1)
9696

9797
def storePreset(self):
98-
query = self.editSql.toPlainText()
98+
query = self.editSql.text()
9999
name = self.presetName.text()
100100
QgsProject.instance().writeEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/name', name )
101101
QgsProject.instance().writeEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/query', query )
@@ -128,24 +128,13 @@ def loadAsLayerToggled(self, checked):
128128
self.loadAsLayerGroup.setChecked( checked )
129129
self.loadAsLayerWidget.setVisible( checked )
130130

131-
def getSql(self):
132-
# If the selection obtained from an editor spans a line break,
133-
# the text will contain a Unicode U+2029 paragraph separator
134-
# character instead of a newline \n character
135-
# (see https://qt-project.org/doc/qt-4.8/qtextcursor.html#selectedText)
136-
sql = self.editSql.textCursor().selectedText().replace(unichr(0x2029), "\n")
137-
if sql == "":
138-
sql = self.editSql.toPlainText()
139-
# try to sanitize query
140-
sql = re.sub( ";\\s*$", "", sql )
141-
return sql
142-
143131
def clearSql(self):
144132
self.editSql.clear()
145133

146134
def executeSql(self):
147-
sql = self.getSql()
148-
if sql == "": return
135+
sql = self.editSql.text()
136+
if sql == "":
137+
return
149138

150139
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
151140

python/plugins/db_manager/highlighter.py

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)