@@ -95,6 +95,7 @@ grammar =
     o 'Number'
     o 'String'
     o 'Function'
+    o 'UserFunction'
   ]
 
   Number: [
@@ -112,6 +113,10 @@ grammar =
   Function: [
     o "FUNCTION LEFT_PAREN ArgumentList RIGHT_PAREN",     -> new FunctionValue($1, $3)
   ]
+
+  UserFunction: [
+    o "LITERAL LEFT_PAREN ArgumentList RIGHT_PAREN",     -> new FunctionValue($1, $3, true)
+  ]
 
   ArgumentList: [
     o 'Value',                                            -> [$1]
 
@@ -29,7 +29,7 @@ exports.NumberValue = class LiteralValue
   toString: -> @value.toString()
 
 exports.FunctionValue = class FunctionValue
-  constructor: (@name, @arguments=[]) -> null
+  constructor: (@name, @arguments=[], @udf=false) -> null
   toString: -> "#{@name}(#{@arguments.join(', ')})"
 
 exports.Order = class Order
 
@@ -1,7 +1,7 @@
 {
   "name": "sql-parser",
   "description": "Lexer and Parser for SQL Syntax",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": {
     "name": "Andy Kent",
     "email": "andy@forward.co.uk"
 
@@ -96,3 +96,9 @@ describe "SQL Grammer", ->
         GROUP BY `x`, `y`
         HAVING (COUNT(`y`) > 1)
       """
+
+    it "parses UDFs", ->
+      expect(parse("SELECT LENGTH(a) FROM my_table").toString()).toEqual """
+      SELECT LENGTH(`a`)
+        FROM `my_table`
+      """
@@ -20,16 +20,16 @@ describe "SQL Lexer", ->
 # 
 # console.log(tokens)
 # 
-# tokens = lexer.tokenize("SELECT name, age FROM my_stream WHERE")
+# tokens = lexer.tokenize("SELECT LENGTH(foo) FROM data")
 # 
 # console.log(tokens)
 # 
-tokens = lexer.tokenize """
-  SELECT x AS `first_name`, min(age) 
-  FROM my_stream
-  WHERE age > 10.2 AND (age < 30 OR first_name = 'andy')
-  GROUP BY age, name 
-  ORDER BY age DESC 
-  HAVING COUNT(*) > 5"""
+# tokens = lexer.tokenize """
+#   SELECT x AS `first_name`, min(age) 
+#   FROM my_stream
+#   WHERE age > 10.2 AND (age < 30 OR first_name = 'andy')
+#   GROUP BY age, name 
+#   ORDER BY age DESC 
+#   HAVING COUNT(*) > 5"""
 
 console.log(tokens)
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sql-parser",`
`3`	`3`	`"description": "Lexer and Parser for SQL Syntax",`
`4`		`- "version": "0.1.2",`
	`4`	`+ "version": "0.1.3",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Andy Kent",`
`7`	`7`	`"email": "andy@forward.co.uk"`
Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,16 @@ describe "SQL Lexer", ->`
`20`	`20`	`#`
`21`	`21`	`# console.log(tokens)`
`22`	`22`	`#`
`23`		`-# tokens = lexer.tokenize("SELECT name, age FROM my_stream WHERE")`
	`23`	`+# tokens = lexer.tokenize("SELECT LENGTH(foo) FROM data")`
`24`	`24`	`#`
`25`	`25`	`# console.log(tokens)`
`26`	`26`	`#`
`27`		`-tokens = lexer.tokenize """`
`28`		- SELECT x AS `first_name`, min(age)
`29`		`- FROM my_stream`
`30`		`- WHERE age > 10.2 AND (age < 30 OR first_name = 'andy')`
`31`		`- GROUP BY age, name`
`32`		`- ORDER BY age DESC`
`33`		`- HAVING COUNT(*) > 5"""`
	`27`	`+# tokens = lexer.tokenize """`
	`28`	+# SELECT x AS `first_name`, min(age)
	`29`	`+# FROM my_stream`
	`30`	`+# WHERE age > 10.2 AND (age < 30 OR first_name = 'andy')`
	`31`	`+# GROUP BY age, name`
	`32`	`+# ORDER BY age DESC`
	`33`	`+# HAVING COUNT(*) > 5"""`
`34`	`34`
`35`	`35`	`console.log(tokens)`