Project

General

Profile

« Previous | Next » 

Revision 2352

Added by Aaron Marcuse-Kubitza over 12 years ago

sql_gen.py: Renamed join_using to join_same to reflect that it can also be used without USING

View differences:

sql.py
755 755 
    in_tables0 = in_tables.pop(0) # first table is separate
756 756 
    in_pkey = pkey(db, in_tables0, recover=True)
757 757 
    in_pkey_col = sql_gen.as_Col(in_pkey, in_tables0)
758 
    input_joins = [in_tables0]+[sql_gen.Join(v, {in_pkey: sql_gen.join_using})
758 
    input_joins = [in_tables0]+[sql_gen.Join(v, {in_pkey: sql_gen.join_same})
759 759 
        for v in in_tables]
760 760
761 761 
    out_pkey = pkey(db, out_table, recover=True)
......
857 857 
                db.log_debug('Joining together output and input pkeys')
858 858 
                run_query_into_pkeys(*mk_select(db, [in_pkeys_ref[0],
859 859 
                    sql_gen.Join(out_pkeys_ref[0],
860 
                    {row_num_col: sql_gen.join_using})], pkeys, start=0))
860 
                    {row_num_col: sql_gen.join_same})], 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