Storm

 === modified file 'storm/expr.py'
 --- storm/expr.py	2009-07-10 05:08:49 +0000
 +++ storm/expr.py	2009-07-23 23:20:11 +0000
@@ -1238,6 +1238,11 @@
      name = "UPPER"
++class Coalesce(NamedFunc):
++    __slots__ = ()
++    name = "COALESCE"
++
++
  # --------------------------------------------------------------------
  # Prefix and suffix expressions
 === modified file 'tests/expr.py'
 --- tests/expr.py	2009-07-10 05:08:49 +0000
 +++ tests/expr.py	2009-07-23 23:20:11 +0000
@@ -1316,6 +1316,20 @@
          self.assertEquals(statement, "UPPER(func1())")
          self.assertEquals(state.parameters, [])
++    def test_coalesce(self):
++        expr = Coalesce(Func1())
++        state = State()
++        statement = compile(expr, state)
++        self.assertEquals(statement, "COALESCE(func1())")
++        self.assertEquals(state.parameters, [])
++
++    def test_coalesce_with_many_arguments(self):
++        expr = Coalesce(Func1(), Func2(), None)
++        state = State()
++        statement = compile(expr, state)
++        self.assertEquals(statement, "COALESCE(func1(), func2(), NULL)")
++        self.assertEquals(state.parameters, [])
++
      def test_not(self):
          expr = Not(Func1())
          state = State()

Merge lp://staging/~jkakar/storm/coalesce-expr into lp://staging/storm