Project

General

Profile

« Previous | Next » 

Revision 3427

bin/map: by_col: Stripping XML functions not in the DB: Remove DB functions based on whether a plain SQL function of that name exists, rather than whether a relational function (i.e. a table) of that name exists. This will allow column-based import to use plain SQL functions that don't have a corresponding relational function.

View differences:

map
334 334
                    sql.truncate(in_db, sql_io.errors_table(in_db, table))
335 335
                
336 336
                # Strip XML functions not in the DB
337
                special_funcs = db_xml.put_table_special_funcs | rel_funcs
338
                xml_func.process(root, is_rel_func=lambda f: f in special_funcs)
337
                def is_rel_func(name):
338
                    return (name in db_xml.put_table_special_funcs
339
                        or sql.function_exists(in_db, sql_gen.Function(name)))
340
                xml_func.process(root, is_rel_func=is_rel_func)
339 341
                if debug: log_debug('Putting stripped:\n'+str(root))
340 342
                    # only calc if debug
341 343
                

Also available in: Unified diff