← Back to branch summary

~free.ekanayaka/storm/any-expr

« back to all changes in this revision

Viewing changes to storm/expr.py

  • Committer: Jamu Kakar
  • Date: 2009-10-23 19:19:16 UTC
  • mfrom: (329.3.1 mysql-reserved-words)
  • Revision ID: jkakar@kakar.ca-20091023191916-6jfp30ed3l2bl1se
Merged mysql-reserved-words [r=gabriel,jamesh] [f=433833]

MySQL reserved words that weren't treated properly before are
handled correctly now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storm/expr.py
1099
1099
        self.order_by = kwargs.get("order_by", Undef)
1100
1100
        self.limit = kwargs.get("limit", Undef)
1101
1101
        self.offset = kwargs.get("offset", Undef)
 
1102
        # If the first expression is of a compatible type, directly
 
1103
        # include its sub expressions.
 
1104
        if len(self.exprs) > 0:
 
1105
            first = self.exprs[0]
 
1106
            if (isinstance(first, self.__class__) and
 
1107
                first.all == self.all and
 
1108
                first.limit is Undef and
 
1109
                first.offset is Undef):
 
1110
                self.exprs = first.exprs + self.exprs[1:]
 
1111
 
1102
1112
 
1103
1113
@compile.when(SetExpr)
1104
1114
def compile_set_expr(compile, expr, state):