Project

General

Profile

« Previous | Next » 

Revision 3417

sql_io.py: put_table(): Removed no longer used distinct_on var (sql.distinct_table() handles filtering the join_cols)

View differences:

lib/sql_io.py
322 322
    insert_in_tables = [insert_in_table]
323 323
    conds = set()
324 324
    join_cols = sql_gen.ColDict(db, out_table)
325
    distinct_on = sql_gen.ColDict(db, out_table)
326 325
    def mk_main_select(joins, cols):
327 326
        conds_ = [(sql_gen.with_table(k, insert_in_table), v) for k, v in conds]
328 327
        return sql.mk_select(db, joins, cols, conds_, limit=limit_ref[0],
......
441 440
            # Different rows violating different unique constraints not
442 441
            # supported
443 442
            assert not join_cols
444
            assert not distinct_on
445 443
            
446
            distinct_on.update(util.dict_subset(mapping, e.cols))
447 444
            join_cols.update(util.dict_subset_right_join(mapping, e.cols))
448 445
            log_debug('Ignoring existing rows, comparing on these columns:\n'
449 446
                +strings.as_inline_table(join_cols, ustr=col_ustr))

Also available in: Unified diff