/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 2125

sql.py: put_table(): Take a dict mapping out to in cols instead of separate in and out cols lists

             if not create: raise
             return put(db, table, row, pkey, row_ct_ref) # insert new row
     def put_table(db, out_table, out_cols, in_tables, in_cols, pkey,
         row_ct_ref=None, table_is_esc=False):
     def put_table(db, out_table, in_tables, mapping, pkey, row_ct_ref=None,
         table_is_esc=False):
         '''Recovers from errors.
         Only works under PostgreSQL (uses INSERT RETURNING).
         @return Name of the table where the pkeys (from INSERT RETURNING) are made
-...
         '''
         pkeys_table = clean_name(out_table)+'_pkeys'
         def insert_():
             return insert_select(db, out_table, out_cols,
                 *mk_select(db, in_tables[0], in_cols, table_is_esc=table_is_esc),
             return insert_select(db, out_table, mapping.keys(), *mk_select(db,
                 in_tables[0], mapping.values(), table_is_esc=table_is_esc),
                 returning=pkey, into=pkeys_table, recover=True,
                 table_is_esc=table_is_esc)
         try:

         # Insert node
         in_tables.append(qual_name(in_table))
         pkeys_table = sql.put_table(db, esc_name(out_table), row.keys(),
             in_tables, row.values(), pkey_, row_ct_ref, table_is_esc=True)
         pkeys_table = sql.put_table(db, esc_name(out_table), in_tables, row, pkey_,
             row_ct_ref, table_is_esc=True)
         if commit: db.db.commit()
         return (pkeys_table, pkey_)

Also available in: Unified diff