Fix incorrect detection of keyword fragments in names (fixes issue7, reported and initial patch by andyboyko).

3 files changed, 32 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 1dbc824..27fa8b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+In Development
+--------------
+
+Bug Fixes
+ * Fixed incorrect detection of keyword fragments embed in names (issue7,
+   reported and initial patch by andyboyko).
+
+
 Release 0.1.1 (May 6, 2009)
 ---------------------------
 
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index 8ccc7de..1cdb98c 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -176,9 +176,9 @@ class Lexer:
             # TODO: Backslash escapes?
             (r"'(''|[^'])*'", String.Single),
             (r'"(""|[^"])*"', String.Symbol), # not a real string literal in ANSI SQL
-            (r'(LEFT |RIGHT )?(INNER |OUTER )?JOIN', Keyword),
-            (r'END( IF| LOOP)?', Keyword),
-            (r'CREATE( OR REPLACE)?', Keyword.DDL),
+            (r'(LEFT |RIGHT )?(INNER |OUTER )?JOIN\b', Keyword),
+            (r'END( IF| LOOP)?\b', Keyword),
+            (r'CREATE( OR REPLACE)?\b', Keyword.DDL),
             (r'[a-zA-Z_][a-zA-Z0-9_]*', is_keyword),
             (r'\$([a-zA-Z_][a-zA-Z0-9_]*)?\$', Name.Builtin),
             (r'[;:()\[\],\.]', Punctuation),
diff --git a/tests/test_tokenize.py b/tests/test_tokenize.py
index 690ef31..a1dd4a8 100644
--- a/tests/test_tokenize.py
+++ b/tests/test_tokenize.py
@@ -41,6 +41,27 @@ class TestTokenize(unittest.TestCase):
         tokens = lexer.tokenize(sql)
         self.assertEqual(''.join(str(x[1]) for x in tokens), sql)
 
+    def test_inline_keywords(self):  # issue 7
+        sql = "create created_foo"
+        tokens = list(lexer.tokenize(sql))
+        self.assertEqual(len(tokens), 3)
+        self.assertEqual(tokens[0][0], Keyword.DDL)
+        self.assertEqual(tokens[2][0], Name)
+        self.assertEqual(tokens[2][1], u'created_foo')
+        sql = "enddate"
+        tokens = list(lexer.tokenize(sql))
+        self.assertEqual(len(tokens), 1)
+        self.assertEqual(tokens[0][0], Name)
+        sql = "join_col"
+        tokens = list(lexer.tokenize(sql))
+        self.assertEqual(len(tokens), 1)
+        self.assertEqual(tokens[0][0], Name)
+        sql = "left join_col"
+        tokens = list(lexer.tokenize(sql))
+        self.assertEqual(len(tokens), 3)
+        self.assertEqual(tokens[2][0], Name)
+        self.assertEqual(tokens[2][1], 'join_col')
+
 
 class TestToken(unittest.TestCase):