Mercurial > sqlpython
comparison sqlpyPlus.py @ 120:e11bbeb3f34c
cleanup statement ends
author | catherine@Elli.myhome.westell.com |
---|---|
date | Wed, 23 Jul 2008 07:10:49 -0400 |
parents | 7882c5e4d744 |
children | 3dd852ab45c0 |
comparison
equal
deleted
inserted
replaced
119:7882c5e4d744 | 120:e11bbeb3f34c |
---|---|
513 result = '\n' + sqlpython.pmatrix(transpr,newdesc) | 513 result = '\n' + sqlpython.pmatrix(transpr,newdesc) |
514 else: | 514 else: |
515 result = sqlpython.pmatrix(self.rows, self.curs.description, self.maxfetch) | 515 result = sqlpython.pmatrix(self.rows, self.curs.description, self.maxfetch) |
516 return result | 516 return result |
517 | 517 |
518 statementEndPattern = re.compile(r'(.*)(;|\\[gGhtxicCsS])\s*(\d*)\s*$', re.DOTALL | re.MULTILINE) | |
519 # what about quote-enclosed? | |
520 | |
521 legalOracle = re.compile('[a-zA-Z_$#]') | 518 legalOracle = re.compile('[a-zA-Z_$#]') |
522 | 519 |
523 rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit') | 520 rowlimitPattern = pyparsing.Word(pyparsing.nums)('rowlimit') |
524 terminatorPattern = (pyparsing.oneOf('; \\s \\S \\c \\C \\t \\x \\h') | 521 terminatorPattern = (pyparsing.oneOf('; \\s \\S \\c \\C \\t \\x \\h') |
525 ^ pyparsing.Literal('\n/\n')) ('terminator') + \ | 522 ^ pyparsing.Literal('\n/\n')) ('terminator') + \ |