Mercurial > kallithea
diff pylons_app/model/db.py @ 234:a0116e944da1
changed naming convention for db modules.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 27 May 2010 21:31:30 +0200 |
parents | 37a832dc4a82 |
children | b18f89d6d17f |
line wrap: on
line diff
--- a/pylons_app/model/db.py Thu May 27 19:20:21 2010 +0200 +++ b/pylons_app/model/db.py Thu May 27 21:31:30 2010 +0200 @@ -2,7 +2,7 @@ from sqlalchemy.orm import relation, backref from sqlalchemy import * -class Users(Base): +class User(Base): __tablename__ = 'users' __table_args__ = {'useexisting':True} user_id = Column("user_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) @@ -15,24 +15,27 @@ email = Column("email", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None) - user_log = relation('UserLogs') + user_log = relation('UserLog') def __repr__(self): return "<User('%s:%s')>" % (self.user_id, self.username) -class UserLogs(Base): +class UserLog(Base): __tablename__ = 'user_logs' __table_args__ = {'useexisting':True} - user_log_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) + user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None) repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None) - user = relation('Users') + user = relation('User') +class Repository(Base): + __tablename__ = 'repositories' + repo_id = Column("repo_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) -class Permissions(Base): +class Permission(Base): __tablename__ = 'permissions' __table_args__ = {'useexisting':True} permission_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)