Changeset 63

Show
Ignore:
Timestamp:
11/08/06 13:55:20 (2 years ago)
Author:
zool
Message:

updates to support mysql:
changed session's "key" to "sessionKey" as the former is a mysql reserved word.
fixed references to this in other modules.
Also changed db.py to use db.type from the config

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/dm/db.py

    r45 r63  
    4949        dbhost = self.dictionary['db.host'] 
    5050        dbname = self.dictionary['db.name'] 
    51         uri = "postgres://%s:%s@%s/%s" % (dbuser, dbpass, dbhost, dbname) 
     51        dbtype = self.dictionary['db.type'] 
     52        uri = "%s://%s:%s@%s/%s" % (dbtype, dbuser, dbpass, dbhost, dbname) 
    5253        try: 
    5354            self.connection = connectionForURI(uri) 

  • trunk/src/dm/dom/session.py

    r2 r63  
    99    "Visitor session." 
    1010 
    11     registerKeyName = 'key' 
     11    registerKeyName = 'sessionKey' 
    1212    isUnique        = False 
    13     key             = String(default='', isRequired=False) 
     13    # renamed from key - which is a mysql reserved word  
     14    sessionKey      = String(default='', isRequired=False) 
    1415    person          = HasA('Person', default=None) 
    1516    lastVisited     = DateTime(default=mx.DateTime.now) 
    …… 
    1718    def initialise(self, register): 
    1819        super(Session, self).initialise(register) 
    19         if not self.key: 
    20             self.key = self.createKey() 
     20        if not self.sessionKey: 
     21            self.sessionKey = self.createKey() 
    2122            self.isChanged = True 
    2223 

  • trunk/src/dm/view/base.py

    r61 r63  
    582582        cookieString = '' 
    583583        if self.session: 
    584             cookieString = self.makeCookieStringFromSessionKey(self.session.key) 
     584            cookieString = self.makeCookieStringFromSessionKey(self.session.sessionKey) 
    585585        else: 
    586586            cookieString = self.NO_AUTH_SESSION_COOKIE_STRING 

  • trunk/src/dm/view/basetest.py

    r43 r63  
    44from dm.ioc import * 
    55from dm.exceptions import * 
    6 from django.utils.httpwrappers import HttpRequest 
     6from django.http import HttpRequest 
    77 
    88def suite():