Mercurial > sqlpython
changeset 135:4c59f4a8b680
wrestling with multi table names in from clause
| author | catherine@Elli.myhome.westell.com |
|---|---|
| date | Thu, 28 Aug 2008 07:53:44 -0400 |
| parents | b532bc8430a6 |
| children | 2e69a257b6ab |
| files | setup.py sqlpyPlus.py |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Wed Aug 27 22:27:17 2008 -0400 +++ b/setup.py Thu Aug 28 07:53:44 2008 -0400 @@ -9,14 +9,14 @@ Operating System :: OS Independent""".splitlines() setup(name="sqlpython", - version="1.4.7.1", + version="1.4.8", description="Command-line interface to Oracle", long_description="Customizable alternative to Oracle's SQL*PLUS command-line interface", author="Luca Canali", author_email="luca.canali@cern.ch", url="https://twiki.cern.ch/twiki/bin/view/PSSGroup/SqlPython", packages=find_packages(), - py_modules = ['mysqlpy','sqlpyPlus','sqlpython','pexpecter'], + py_modules = ['mysqlpy','completion','sqlpyPlus','sqlpython','pexpecter'], include_package_data=True, install_requires=['pyparsing','cmd2>=0.3.5','cx_Oracle'], keywords = 'client oracle database',
--- a/sqlpyPlus.py Wed Aug 27 22:27:17 2008 -0400 +++ b/sqlpyPlus.py Thu Aug 28 07:53:44 2008 -0400 @@ -513,6 +513,9 @@ tableNameRegex = re.compile( r'(from|update)\s+(([a-zA-Z0-9_#$]+)\.)?([a-zA-Z0-9_#$]+)\s+', re.IGNORECASE | re.DOTALL | re.MULTILINE) + tableNameRegex = re.compile( + r'(from|update)(.*)(where|set)', + re.IGNORECASE | re.DOTALL | re.MULTILINE) columnNameRegex = re.compile( r'select\s+(.*)from', re.IGNORECASE | re.DOTALL | re.MULTILINE)