@@ -50,10 +50,10 @@ def __init__(self, iface, db, parent=None):
50
50
settings = QSettings ()
51
51
self .restoreGeometry (settings .value ("/DB_Manager/sqlWindow/geometry" , QByteArray (), type = QByteArray ))
52
52
53
- self .editSql .setAcceptRichText (False )
54
53
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)
57
57
58
58
# allow to copy results
59
59
copyAction = QAction ("copy" , self )
@@ -95,7 +95,7 @@ def updatePresetsCombobox(self):
95
95
self .presetCombo .setCurrentIndex (- 1 )
96
96
97
97
def storePreset (self ):
98
- query = self .editSql .toPlainText ()
98
+ query = self .editSql .text ()
99
99
name = self .presetName .text ()
100
100
QgsProject .instance ().writeEntry ('DBManager' ,'savedQueries/q' + str (name .__hash__ ())+ '/name' , name )
101
101
QgsProject .instance ().writeEntry ('DBManager' ,'savedQueries/q' + str (name .__hash__ ())+ '/query' , query )
@@ -128,24 +128,13 @@ def loadAsLayerToggled(self, checked):
128
128
self .loadAsLayerGroup .setChecked ( checked )
129
129
self .loadAsLayerWidget .setVisible ( checked )
130
130
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
-
143
131
def clearSql (self ):
144
132
self .editSql .clear ()
145
133
146
134
def executeSql (self ):
147
- sql = self .getSql ()
148
- if sql == "" : return
135
+ sql = self .editSql .text ()
136
+ if sql == "" :
137
+ return
149
138
150
139
QApplication .setOverrideCursor (QCursor (Qt .WaitCursor ))
151
140
0 commit comments