##// END OF EJS Templates
licensing updates, code cleanups
licensing updates, code cleanups

File last commit:

r242:5da4ef11 default
r252:3782a6d6 default
Show More
db.py
52 lines | 3.2 KiB | text/x-python | PythonLexer
Model update for sqlalchemy 0.6.0
r89 from pylons_app.model.meta import Base
Marcin Kuzminski
Added sqlalchemy support...
r49 from sqlalchemy.orm import relation, backref
rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic.
r226 from sqlalchemy import *
Marcin Kuzminski
Added sqlalchemy support...
r49
changed naming convention for db modules.
r234 class User(Base):
Marcin Kuzminski
Added sqlalchemy support...
r49 __tablename__ = 'users'
__table_args__ = {'useexisting':True}
Model update for sqlalchemy 0.6.0
r89 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)
rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic.
r226 name = Column("name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
lastname = Column("lastname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
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)
changed naming convention for db modules.
r234 user_log = relation('UserLog')
some beaker cache changes, and added repr to models
r232
def __repr__(self):
return "<User('%s:%s')>" % (self.user_id, self.username)
Marcin Kuzminski
Updated database model, with FK and Booleans
r61
changed naming convention for db modules.
r234 class UserLog(Base):
Marcin Kuzminski
Added sqlalchemy support...
r49 __tablename__ = 'user_logs'
__table_args__ = {'useexisting':True}
changed naming convention for db modules.
r234 user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
Model update for sqlalchemy 0.6.0
r89 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)
rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic.
r226
changed naming convention for db modules.
r234 user = relation('User')
rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic.
r226
changed naming convention for db modules.
r234 class Repository(Base):
__tablename__ = 'repositories'
repo_id = Column("repo_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
Added lastlogin to user after login, model db update
r242 repo_name = Column("repo_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None)
private = Column("private", BOOLEAN(), nullable=True, unique=None, default=None)
user = relation('User')
changed naming convention for db modules.
r234 class Permission(Base):
rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic.
r226 __tablename__ = 'permissions'
__table_args__ = {'useexisting':True}
permission_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1)
permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
Adde draft for permissions systems, made all needed decorators, and checks. For future usage in the system.
r239 permission_longname = Column("permission_longname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
some beaker cache changes, and added repr to models
r232 def __repr__(self):
return "<Permission('%s:%s')>" % (self.permission_id, self.permission_name)