Project

General

Profile

« Previous | Next » 

Revision 2656

Added by Aaron Marcuse-Kubitza over 12 years ago

sql.py: put_table(): Fixed bug where mapping was still a plain dict because that's what dicts.join() returns, by moving the wrapping of it in a sql_gen.ColDict after dicts.join()

View differences:

lib/sql.py
936 936 
    @return sql_gen.Col Where the output pkeys are made available
937 937 
    '''
938 938 
    out_table = sql_gen.as_Table(out_table)
939 
    mapping = sql_gen.ColDict(db, out_table, mapping)
940 939
941 940 
    def log_debug(msg): db.log_debug(msg, level=1.5)
942 941 
    def col_ustr(str_):
......
967 966 
    input_joins = [in_table]
968 967 
    db.log_debug('Temp table: '+strings.as_tt(in_table.to_str(db)), level=2)
969 968
969 
    mapping = sql_gen.ColDict(db, out_table, mapping)
970 
        # after applying dicts.join() because that returns a plain dict
971
970 972 
    # Resolve default value column
971 973 
    try: default = mapping[default]
972 974 
    except KeyError:

Also available in: Unified diff