@@ -351,7 +351,7 @@ def executeSqlCompleted(self):
351
351
352
352
def executeSql (self ):
353
353
354
- sql = self ._getSqlQuery ()
354
+ sql = self ._getExecutableSqlQuery ()
355
355
if sql == "" :
356
356
return
357
357
@@ -393,7 +393,7 @@ def _getSqlLayer(self, _filter):
393
393
else :
394
394
geomFieldName = None
395
395
396
- query = self ._getSqlQuery ()
396
+ query = self ._getSqlExecutableQuery ()
397
397
if query == "" :
398
398
return None
399
399
@@ -438,7 +438,7 @@ def loadSqlLayer(self):
438
438
QgsProject .instance ().addMapLayers ([layer ], True )
439
439
440
440
def fillColumnCombos (self ):
441
- query = self ._getSqlQuery ()
441
+ query = self ._getExecutableSqlQuery ()
442
442
if query == "" :
443
443
return
444
444
@@ -588,16 +588,27 @@ def createView(self):
588
588
name , ok = QInputDialog .getText (None , self .tr ("View Name" ), self .tr ("View name" ))
589
589
if ok :
590
590
try :
591
- self .db .connector .createSpatialView (name , self ._getSqlQuery ())
591
+ self .db .connector .createSpatialView (name , self ._getExecutableSqlQuery ())
592
592
except BaseError as e :
593
593
DlgDbError .showError (e , self )
594
594
595
595
def _getSqlQuery (self ):
596
596
sql = self .editSql .selectedText ()
597
597
if len (sql ) == 0 :
598
- sql = self .editSql .text (). replace ( ' \n ' , ' ' ). strip ()
598
+ sql = self .editSql .text ()
599
599
return sql
600
600
601
+ def _getExecutableSqlQuery (self ):
602
+ sql = self ._getSqlQuery ()
603
+
604
+ # Clean it up!
605
+ lines = []
606
+ for line in sql .split ('\n ' ):
607
+ if not line .strip ().startswith ('--' ):
608
+ lines .append (line )
609
+ sql = ' ' .join (lines )
610
+ return sql .strip ()
611
+
601
612
def uniqueChanged (self ):
602
613
# when an item is (un)checked, simply trigger an update of the combobox text
603
614
self .uniqueTextChanged (None )
0 commit comments