Project

General

Profile

« Previous | Next » 

Revision 2365

Added by Aaron Marcuse-Kubitza over 12 years ago

sql.py: put_table(): ignore(): Fixed bug where value needed to be filtered through repr(). NullValueException: Fixed bug where value passed to ignore() was the string 'NULL' instead of the value None.

View differences:

sql.py
781 781 
    def log_exc(e):
782 782 
        db.log_debug('Caught exception: '+exc.str_(e, first_line_only=True))
783 783 
    def ignore(in_col, value):
784 
        db.log_debug('Ignoring rows with '+str(in_col)+' = '+value)
784 
        db.log_debug('Ignoring rows with '+str(in_col)+' = '+repr(value))
785 785 
        assert in_col not in conds # avoid infinite loops
786 786 
        conds[in_col] = sql_gen.CompareCond(value, '!=')
787 787
......
822 822 
            except KeyError:
823 823 
                db.log_debug('Missing mapping for NOT NULL '+out_col)
824 824 
                limit = 0 # just create an empty pkeys table
825 
            else: ignore(in_col, 'NULL')
825 
            else: ignore(in_col, None)
826 826 
        except FunctionValueException, e:
827 827 
            log_exc(e)
828 828

Also available in: Unified diff