[dbmanager] Try to set sensible default column choice for sql window

qgis · Sep 15, 2014 · 4e3510e · 4e3510e
1 parent 3bf6f3e
commit 4e3510e
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
@@ -244,11 +244,31 @@ def fillColumnCombos(self):
       if c:
         c.close()
         del c
+
+    # get sensible default columns. do this before sorting in case there's hints in the column order (eg, id is more likely to be first)
+    try:
+      defaultGeomCol = next(col for col in cols if col in ['geom','geometry','the_geom'])
+    except:
+      defaultGeomCol = None
+    try:
+      defaultUniqueCol = [col for col in cols if 'id' in col][0]
+    except:
+      defaultUniqueCol = None
 
     cols.sort()
     self.uniqueCombo.addItems( cols )
     self.geomCombo.addItems( cols )
 
+    # set sensible default columns
+    try:
+      self.geomCombo.setCurrentIndex( cols.index(defaultGeomCol) )  
+    except:
+      pass
+    try:
+      self.uniqueCombo.setCurrentIndex( cols.index(defaultUniqueCol) )  
+    except:
+      pass
+
     QApplication.restoreOverrideCursor()
 
   def copySelectedResults(self):