Project

General

Profile

« Previous | Next » 

Revision 2505

Added by Aaron Marcuse-Kubitza over 12 years ago

sql.py: put_table(): When calling strings.as_*table(), pass custom ustr that removes col renames and adds double quotes on plain strings

View differences:

lib/sql.py
880 880 
    into = sql_gen.as_Table(into)
881 881
882 882 
    def log_debug(msg): db.log_debug(msg, level=1.5)
883 
    def col_ustr(str_):
884 
        return strings.ustr(sql_gen.remove_col_rename(sql_gen.as_Col(str_)))
883 885
884 886 
    log_debug('********** New iteration **********')
885 
    log_debug('Inserting these input columns into '
886 
        +strings.as_tt(out_table.to_str(db))+':\n'+strings.as_table(mapping))
887 
    log_debug('Inserting these input columns into '+strings.as_tt(
888 
        out_table.to_str(db))+':\n'+strings.as_table(mapping, ustr=col_ustr))
887 889
888 890 
    # Create input joins from list of input tables
889 891 
    in_tables_ = in_tables[:] # don't modify input!
......
972 974 
            old_join_cols = join_cols.copy()
973 975 
            join_cols.update(util.dict_subset(mapping, e.cols))
974 976 
            log_debug('Ignoring existing rows, comparing on these columns:\n'
975 
                +strings.as_inline_table(join_cols))
977 
                +strings.as_inline_table(join_cols, ustr=col_ustr))
976 978 
            assert join_cols != old_join_cols # avoid infinite loops
977 979 
        except NullValueException, e:
978 980 
            log_exc(e)

Also available in: Unified diff