Ticket #3312: 3312_clearmappers.patch

File 3312_clearmappers.patch, 1.3 KB (added by yi, 22 months ago)

add clear_mapper call to db_config.py

  • sage/dsage/database/db_config.py

    # HG changeset patch
    # User Yi Qiang <yqiang@gmail.com>
    # Date 1211865166 25200
    # Node ID 885f800e91d8ebe13e3af24ca31eeb4b94672bbe
    # Parent  6a6766d05f3bc23e52c4ce7477132b9a7ce1607d
    [mq]: 3312_clear_mappers.patch
    
    diff -r 6a6766d05f3b -r 885f800e91d8 sage/dsage/database/db_config.py
    a b  
    33from twisted.python import log 
    44     
    55from sqlalchemy import * 
    6 from sqlalchemy.orm import sessionmaker, mapper, deferred 
     6from sqlalchemy.orm import sessionmaker, mapper, deferred, clear_mappers 
    77 
    88from sage.dsage.misc.constants import DELIMITER 
    99from sage.dsage.database.sql_functions import optimize_sqlite 
     
    3131         
    3232        return conn 
    3333 
     34    # First we clear all predefined mappers 
     35    clear_mappers() 
     36     
    3437    # engine = create_engine('sqlite:///%s' % (db_file), encoding='latin1', 
    3538    #                        echo=True) 
    3639    engine = create_engine('sqlite:///', creator=connect, echo=False) 
    3740    metadata.create_all(engine) 
    3841     
    39     # mapper(Job, jobs) 
    4042    mapper(Job, jobs, properties={'result': deferred(jobs.c.result), 
    4143                                  'data': deferred(jobs.c.data)}) 
    4244    mapper(Client, clients)