Project

General

Profile

« Previous | Next » 

Revision 2220

sql.py: mk_select(): parse_col(): Use sql_gen.value2sql_gen().to_str()

View differences:

lib/sql.py
435 435
    
436 436
    def parse_col(field, default_table=None):
437 437
        '''Parses fields'''
438
        if field == None: field = (field,) # for None values, tuple is optional
439
        is_tuple = isinstance(field, tuple)
440
        if is_tuple and len(field) == 1: # field is literal value
441
            value, = field
442
            sql_ = '%s'
443
            params.append(value)
444
        elif is_tuple and len(field) == 2: # field is col with table
445
            table, col = field
446
            if not table_is_esc: table = esc_name_(table)
447
            sql_ = table+'.'+esc_name_(col)
448
        else:
449
            sql_ = esc_name_(field) # field is col name
450
            if default_table != None: sql_ = default_table+'.'+sql_
451
        return sql_
438
        return sql_gen.value2sql_gen(field, default_table,
439
            table_is_esc).to_str(db)
452 440
    def cond(entry):
453 441
        '''Parses conditions'''
454 442
        left, right = entry

Also available in: Unified diff