# HG changeset patch
# User catherine@Elli.myhome.westell.com
# Date 1219924424 14400
# Node ID 4c59f4a8b680be488d9ec61442f0cda04fd8ea4b
# Parent  b532bc8430a6a4b82cd3770b099cdbc4f66b91fb
wrestling with multi table names in from clause

diff -r b532bc8430a6 -r 4c59f4a8b680 setup.py
--- 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',
diff -r b532bc8430a6 -r 4c59f4a8b680 sqlpyPlus.py
--- 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)