~free.ekanayaka/storm/any-expr

« back to all changes in this revision

Viewing changes to storm/store.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:
1206
1206
        value = result.get_one()[0]
1207
1207
        variable_factory = getattr(column, "variable_factory", None)
1208
1208
        if variable_factory:
1209
 
            variable = variable_factory()
 
1209
            variable = variable_factory(allow_none=True)
1210
1210
            result.set_variable(variable, value)
1211
1211
            return variable.get()
1212
1212
        return value