[GRASS-SVN] r72537 - grass/trunk/gui/wxpython/dbmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-03-23 12:41:45 -0700 (Fri, 23 Mar 2018)
New Revision: 72537

Modified:
   grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py
Log:
wxGUI/dbmgr: get sample/all values tuning

Modified: grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py
===================================================================
--- grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py	2018-03-23 19:29:33 UTC (rev 72536)
+++ grass/trunk/gui/wxpython/dbmgr/sqlbuilder.py	2018-03-23 19:41:45 UTC (rev 72537)
@@ -359,10 +359,12 @@
 
         self.list_values.Clear()
 
+        sql = "SELECT DISTINCT {column} FROM {table} ORDER BY {column}".format(
+            column=column, table=self.tablename)
+        if justsample:
+            sql += " LIMIT {}".format(255)
         data = grass.db_select(
-            sql="SELECT %s FROM %s" %
-            (column,
-             self.tablename),
+            sql=sql,
             database=self.database,
             driver=self.driver,
             sep='{_sep_}')
@@ -373,17 +375,16 @@
             self.dbInfo.GetTable(self.layer))[column]
 
         i = 0
-        for item in sorted(set(map(lambda x: desc['ctype'](x[0]), data))):
-            if justsample and i > 255:
-                break
-
+        items = []
+        for item in data: #sorted(set(map(lambda x: desc['ctype'](x[0]), data))):
             if desc['type'] not in ('character', 'text'):
-                item = str(item)
+                items.append(str(item[0]))
             else:
-                item = u"'{}'".format(GetUnicodeValue(item))
-            self.list_values.Append(item)
+                items.append(u"'{}'".format(GetUnicodeValue(item[0])))
             i += 1
 
+        self.list_values.AppendItems(items)
+        
     def OnSampleValues(self, event):
         """Get sample values"""
         self.OnUniqueValues(None, True)