[Emacs-diffs] /srv/bzr/emacs/trunk r110974: Teach sql-mode's imenu about IF NOT EXISTS

[Daniel Colascione]

------------------------------------------------------------
revno: 110974 [merge]
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 13:47:10 -0800
message:
  Teach sql-mode's imenu about IF NOT EXISTS
modified:
  lisp/ChangeLog
  lisp/progmodes/sql.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-21 21:38:56 +0000
+++ b/lisp/ChangeLog    2012-11-21 21:47:10 +0000
@@ -1,7 +1,8 @@
 2012-11-21  Daniel Colascione  <address@hidden>
 
        * progmodes/sql.el (sql-mode-font-lock-object-name): Support IF NOT 
EXISTS
-       in SQL declarations.
+       in SQL declarations for font-lock.
+       (sql-imenu-generic-expression): Teach imenu about IF NOT EXISTS.
 
 2012-11-21  Glenn Morris  <address@hidden>
 

=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el     2012-11-21 21:38:56 +0000
+++ b/lisp/progmodes/sql.el     2012-11-21 21:47:10 +0000
@@ -736,15 +736,15 @@
 
 (defvar sql-imenu-generic-expression
   ;; Items are in reverse order because they are rendered in reverse.
-  '(("Rules/Defaults" 
"^\\s-*create\\s-+\\(\\w+\\s-+\\)*\\(rule\\|default\\)\\s-+\\(\\w+\\)" 3)
-    ("Sequences" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*sequence\\s-+\\(\\w+\\)" 2)
-    ("Triggers" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*trigger\\s-+\\(\\w+\\)" 2)
-    ("Functions" 
"^\\s-*\\(create\\s-+\\(\\w+\\s-+\\)*\\)?function\\s-+\\(\\w+\\)" 3)
-    ("Procedures" 
"^\\s-*\\(create\\s-+\\(\\w+\\s-+\\)*\\)?proc\\(edure\\)?\\s-+\\(\\w+\\)" 4)
-    ("Packages" 
"^\\s-*create\\s-+\\(\\w+\\s-+\\)*package\\s-+\\(body\\s-+\\)?\\(\\w+\\)" 3)
-    ("Types" 
"^\\s-*create\\s-+\\(\\w+\\s-+\\)*type\\s-+\\(body\\s-+\\)?\\(\\w+\\)" 3)
-    ("Indexes" "^\\s-*create\\s-+\\(\\w+\\s-+\\)*index\\s-+\\(\\w+\\)" 2)
-    ("Tables/Views" 
"^\\s-*create\\s-+\\(\\w+\\s-+\\)*\\(table\\|view\\)\\s-+\\(\\w+\\)" 3))
+  '(("Rules/Defaults" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:rule\\|default\\)\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\s-+\\(\\w+\\)"
 1)
+    ("Sequences" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*sequence\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Triggers" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*trigger\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Functions" 
"^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?function\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Procedures" 
"^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?proc\\(?:edure\\)?\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Packages" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*package\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Types" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*type\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Indexes" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*index\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1)
+    ("Tables/Views" 
"^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:table\\|view\\)\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)"
 1))
   "Define interesting points in the SQL buffer for `imenu'.
 
 This is used to set `imenu-generic-expression' when SQL mode is