Mercurial > sqlpython
changeset 237:95070e01907d
not col num works
| author | catherine@Elli.myhome.westell.com |
|---|---|
| date | Fri, 27 Feb 2009 06:51:54 -0500 |
| parents | 7f999b141fcd |
| children | 254fb9d3f4c3 |
| files | sqlpython/sqlpyPlus.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/sqlpython/sqlpyPlus.py Thu Feb 26 20:09:46 2009 -0500 +++ b/sqlpython/sqlpyPlus.py Fri Feb 27 06:51:54 2009 -0500 @@ -499,7 +499,7 @@ pyparsing.SkipTo(pyparsing.stringEnd)('remainder') negator = pyparsing.Literal('!')('exclude') - colNumber = pyparsing.Optional(negator) + pyparsing.Literal('*') + pyparsing.Word('-' + pyparsing.nums, pyparsing.nums)('column_number') + colNumber = pyparsing.Optional(negator) + pyparsing.Literal('.') + pyparsing.Word('-' + pyparsing.nums, pyparsing.nums)('column_number') colName = negator + pyparsing.Word('$_#' + pyparsing.alphas, '$_#' + pyparsing.alphanums)('standard_word') wildColName = pyparsing.Optional(negator) + pyparsing.Word('*$_#' + pyparsing.alphas, '*$_#' + pyparsing.alphanums, min=2)('wildcard_word') wildSqlParser = colNumber ^ colName ^ wildColName @@ -550,7 +550,7 @@ result = self.emptyCommaRegex.sub(',', result) result = self.deadStarterCommaRegex.sub('', result) result = self.deadEnderCommaRegex.sub('', result) - return result + columnlist.remainder + return result + ' ' + columnlist.remainder rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit') terminators = '; \\C \\t \\i \\p \\l \\L \\b '.split() + output_templates.keys()