diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2012-06-14 23:19:26 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2012-06-14 23:19:26 +0200 |
commit | 0dc6affa3b12086cb0f05a2ff4939ab1967819d4 (patch) | |
tree | 03c8cdd5512a0e96823e99a22050dc2981719c29 /rhodecode/model/db.py | |
parent | 1b70966e8685f8e658a76ec4242fb98c8094df15 (diff) |
Initial version of landing revisions ref #483
- fixed relevant tests for creation of repo
- added some tests for git
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/db.py')
-rwxr-xr-x | rhodecode/model/db.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index e9e4a91b..4bcbf293 100755 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -295,7 +295,7 @@ class User(Base, BaseModel): password = Column("password", String(length=255, 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=False) - name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + name = Column("firstname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) _email = Column("email", String(length=255, 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) @@ -500,13 +500,14 @@ class Repository(Base, BaseModel): repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True) repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None) clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None) - repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg') + repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None) user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None) private = Column("private", Boolean(), nullable=True, unique=None, default=None) enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True) enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True) description = Column("description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) created_on = Column('created_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now) + landing_rev = Column("landing_revision", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None) fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None) group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None) @@ -523,7 +524,7 @@ class Repository(Base, BaseModel): logs = relationship('UserLog') def __unicode__(self): - return u"<%s('%s:%s')>" % (self.__class__.__name__,self.repo_id, + return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id, self.repo_name) @classmethod |