identifiers (schemas, tables, fields) added to DBManager sql windows completer list.

Thanks Silvio Grosso for the sponsorship.
This commit is contained in:
Giuseppe Sucameli 2012-08-27 17:07:27 +02:00
parent 078f5b846c
commit bcb038504e
3 changed files with 26 additions and 3 deletions

View File

@ -40,10 +40,11 @@ class SqlCompleter(QCompleter):
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):

View File

@ -906,5 +906,17 @@ class PostGisDBConnector(DBConnector):
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

View File

@ -593,5 +593,15 @@ class SpatiaLiteDBConnector(DBConnector):
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