--- a/sqlpyPlus.py	Wed Aug 27 22:21:44 2008 -0400
+++ b/sqlpyPlus.py	Wed Aug 27 22:27:17 2008 -0400
@@ -534,7 +534,7 @@
                 stmt1 = "SELECT table_name FROM all_tab_columns WHERE column_name = '%s' AND table_name LIKE '%s%%'"
                 for columnName in columnNames:
                     completions.extend(self.select_list(stmt1 % (columnName, text)))                    
-        if segment in ('from', 'update') and (not completions):
+        if segment in ('from', 'update', 'insert into') and (not completions):
             stmt = "SELECT table_name FROM user_tables WHERE table_name LIKE '%s%%'"
             completions = self.select_list(stmt % (text))
             if not completions:
@@ -542,7 +542,7 @@
                       UNION
                       SELECT DISTINCT owner FROM all_tables WHERE owner LIKE '%%%s'"""
                 completions = self.select_list(stmt % (text, text))
-        if segment in ('where', 'group by', 'order by'):
+        if segment in ('where', 'group by', 'order by', 'having', 'set'):
             try:
                 owner, tableName = self.tableNameRegex.search(line).groups()[2:4]
             except AttributeError: