Conflicts: pyfpdb/Database.py Resolve by reverting to sqlcoder's version; it uses the nice insert in fillDefaultData for each case now and having the DB backends separate might be good for the foreseeable future.