Project

General

Profile

« Previous | Next » 

Revision 2355

sql.py: put_table(): Joining together output and input pkeys: Use new sql_gen.join_same_not_null

View differences:

sql.py
855 855
                add_row_num(db, in_pkeys_ref[0]) # for joining with output pkeys
856 856
                
857 857
                db.log_debug('Joining together output and input pkeys')
858
                run_query_into_pkeys(*mk_select(db, [in_pkeys_ref[0],
859
                    sql_gen.Join(out_pkeys_ref[0],
860
                    {row_num_col: sql_gen.join_same})], pkeys, start=0))
858
                pkey_joins = [in_pkeys_ref[0], sql_gen.Join(out_pkeys_ref[0],
859
                    {row_num_col: sql_gen.join_same_not_null})]
860
                run_query_into_pkeys(*mk_select(db, pkey_joins, pkeys, start=0))
861 861
            
862 862
            db.log_debug("Setting missing rows' pkeys to NULL")
863 863
            missing_rows_joins = input_joins+[sql_gen.Join(pkeys_ref[0],

Also available in: Unified diff