identifiers (schemas, tables, fields) added to DBManager sql windows …

…completer list. Thanks Silvio Grosso for the sponsorship.
qgis · Aug 27, 2012 · bcb0385 · bcb0385
1 parent 078f5b8
commit bcb0385
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/python/plugins/db_manager/completer.py b/python/plugins/db_manager/completer.py
@@ -40,10 +40,11 @@ def __init__(self, editor, db=None):
 		wordlist = QStringList()
 		for name, value in dictionary.iteritems():
 			wordlist << value
+		wordlist = QStringList() << list(set( wordlist ))	# remove duplicates
 
 		# setup the completer
 		QCompleter.__init__(self, sorted(wordlist), editor)
-		self.setModelSorting(QCompleter.CaseInsensitivelySortedModel)
+		self.setModelSorting(QCompleter.CaseSensitivelySortedModel)
 		self.setWrapAround(False)
 
 		if isinstance(editor, CompletionTextEdit):

diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -906,5 +906,17 @@ def connection_error_types(self):
 
 	def getSqlDictionary(self):
 		from .sql_dictionary import getSqlDictionary
-		return getSqlDictionary()
+		sql_dict = getSqlDictionary()
+
+		# get schemas, tables and field names
+		items = []
+		sql = u"""SELECT nspname FROM pg_namespace WHERE nspname !~ '^pg_' AND nspname != 'information_schema' 
+UNION SELECT relname FROM pg_class WHERE relkind IN ('v', 'r') 
+UNION SELECT attname FROM pg_attribute WHERE attnum > 0"""
+		c = self._execute(None, sql)
+		for row in c.fetchall():
+			items.append( row[0] )
+
+		sql_dict["identifier"] = items
+		return sql_dict
 
diff --git a/python/plugins/db_manager/db_plugins/spatialite/connector.py b/python/plugins/db_manager/db_plugins/spatialite/connector.py
@@ -593,5 +593,15 @@ def connection_error_types(self):
 
 	def getSqlDictionary(self):
 		from .sql_dictionary import getSqlDictionary
-		return getSqlDictionary()
+		sql_dict = getSqlDictionary()
+
+		items = []
+		for tbl in self.getTables():
+			items.append( tbl[1] )	# table name
+
+			for fld in self.getTableFields( tbl[0] ):
+				items.append( fld[1] )	# field name
+
+		sql_dict["identifier"] = items
+		return sql_dict