kallithea Changeset - 70bf0be59653

Changeset - 70bf0be59653

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2011-02-25 01:12:49
marcin@python-works.com

fixed Session problems in model class functions
added dummy mapper extension for repository

1 file changed with 13 insertions and 2 deletions:

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -28,18 +28,27 @@ import logging @@
 import datetime
 from datetime import date
 from sqlalchemy import *
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.orm import relationship, backref
-from sqlalchemy.orm.session import Session
+from sqlalchemy.orm.interfaces import MapperExtension
 from rhodecode.model.meta import Base
+from rhodecode.model.meta import Base, Session
 log = logging.getLogger(__name__)
 #==============================================================================
 # MAPPER EXTENSIONS
 #==============================================================================
 class RepositoryMapper(MapperExtension):
     def after_update(self, mapper, connection, instance):
         pass
 class RhodeCodeSettings(Base):
     __tablename__ = 'rhodecode_settings'
     __table_args__ = (UniqueConstraint('app_settings_name'), {'useexisting':True})
     app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     app_settings_name = Column("app_settings_name", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     app_settings_value = Column("app_settings_value", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
@@ @@ -158,12 +167,14 @@ class UsersGroupMember(Base): @@
         self.users_group_id = gr_id
         self.user_id = u_id
 class Repository(Base):
     __tablename__ = 'repositories'
     __table_args__ = (UniqueConstraint('repo_name'), {'useexisting':True},)
     __mapper_args__ = {'extension':RepositoryMapper()}
     repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repo_name = Column("repo_name", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     repo_type = Column("repo_type", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')
     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)

0 comments (0 inline, 0 general)