Mercurial > kallithea
changeset 89:b2c38dee135a
Model update for sqlalchemy 0.6.0
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 19 Apr 2010 22:55:58 +0200 |
| parents | 911dab498eb2 |
| children | 0c22a870bb79 |
| files | pylons_app/model/db.py |
| diffstat | 1 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/model/db.py Mon Apr 19 22:52:31 2010 +0200 +++ b/pylons_app/model/db.py Mon Apr 19 22:55:58 2010 +0200 @@ -1,27 +1,30 @@ -from sqlalchemy.ext.declarative import declarative_base +import sqlalchemy +from pylons_app.model.meta import Base +from sqlalchemy import ForeignKey, Column from sqlalchemy.orm import relation, backref -from sqlalchemy import ForeignKey, Column, Table, Sequence -from sqlalchemy.types import * -from sqlalchemy.databases.sqlite import * -from pylons_app.model.meta import Base +if sqlalchemy.__version__ == '0.6.0': + from sqlalchemy.dialects.sqlite import * +else: + from sqlalchemy.databases.sqlite import SLBoolean as BOOLEAN, \ + SLInteger as INTEGER, SLText as TEXT, SLDateTime as DATETIME class Users(Base): __tablename__ = 'users' __table_args__ = {'useexisting':True} - user_id = Column("user_id", SLInteger(), nullable=False, unique=True, default=None, primary_key=1) - username = Column("username", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - password = Column("password", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - active = Column("active", SLBoolean(), nullable=True, unique=None, default=None) - admin = Column("admin", SLBoolean(), nullable=True, unique=None, default=None) + user_id = Column("user_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) + username = Column("username", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + password = Column("password", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + active = Column("active", BOOLEAN(), nullable=True, unique=None, default=None) + admin = Column("admin", BOOLEAN(), nullable=True, unique=None, default=None) action_log = relation('UserLogs') class UserLogs(Base): __tablename__ = 'user_logs' __table_args__ = {'useexisting':True} - id = Column("id", SLInteger(), nullable=False, unique=True, default=None, primary_key=1) - user_id = Column("user_id", SLInteger(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None) - repository = Column("repository", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - action = Column("action", SLText(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) - action_date = Column("action_date", SLDateTime(timezone=False), nullable=True, unique=None, default=None) + id = Column("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')