This commit is contained in:
Miroslav Stampar 2011-08-16 06:14:40 +00:00
parent df4abf1af1
commit 262996fc5b
2 changed files with 26 additions and 25 deletions

View File

@ -211,10 +211,9 @@ class Dump:
for column in colList: for column in colList:
colType = columns[column] colType = columns[column]
maxlength1 = max(maxlength1, len(column))
if colType is not None: maxlength1 = max(maxlength1, len(column or ""))
maxlength2 = max(maxlength2, len(colType)) maxlength2 = max(maxlength2, len(colType or ""))
maxlength1 = max(maxlength1, len("COLUMN")) maxlength1 = max(maxlength1, len("COLUMN"))
lines1 = "-" * (maxlength1 + 2) lines1 = "-" * (maxlength1 + 2)

View File

@ -1141,6 +1141,7 @@ class Enumeration:
if not isNoneValue(columnData): if not isNoneValue(columnData):
name = safeSQLIdentificatorNaming(columnData[0]) name = safeSQLIdentificatorNaming(columnData[0])
if name:
if len(columnData) == 1: if len(columnData) == 1:
columns[name] = "" columns[name] = ""
else: else:
@ -1242,6 +1243,7 @@ class Enumeration:
query = agent.limitQuery(index, query, field) query = agent.limitQuery(index, query, field)
column = inject.getValue(query, inband=False, error=False) column = inject.getValue(query, inband=False, error=False)
if not isNoneValue(column):
if not onlyColNames: if not onlyColNames:
if Backend.getIdentifiedDbms() in ( DBMS.MYSQL, DBMS.PGSQL ): if Backend.getIdentifiedDbms() in ( DBMS.MYSQL, DBMS.PGSQL ):
query = rootQuery.blind.query2 % (unsafeSQLIdentificatorNaming(tbl), column, unsafeSQLIdentificatorNaming(conf.db)) query = rootQuery.blind.query2 % (unsafeSQLIdentificatorNaming(tbl), column, unsafeSQLIdentificatorNaming(conf.db))