# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-02-10 23:35:48
# Node ID e7478ac19f9fcb33e47570d0c716d683ddf4eb09
# Parent  4f834b0abcd3bf0e0b2a2e3bebbbec803a96d557

updated db migrations to schema 3

diff --git a/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py b/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py
--- a/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py
+++ b/rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py
@@ -22,20 +22,58 @@ def upgrade(migrate_engine):
     #==========================================================================
     # Add table `groups``
     #==========================================================================
-    from rhodecode.model.db import Group
-    Group().__table__.create()
+#    from rhodecode.model.db import Group
+#    Group().__table__.create()
 
     #==========================================================================
     # Add table `group_to_perm`
     #==========================================================================
-    from rhodecode.model.db import GroupToPerm
-    GroupToPerm().__table__.create()
+#    from rhodecode.model.db import GroupToPerm
+#    GroupToPerm().__table__.create()
+
+    #==========================================================================
+    # Add table `users_groups`
+    #==========================================================================
+#    from rhodecode.model.db import UsersGroup
+#    UsersGroup().__table__.create()
+
+    #==========================================================================
+    # Add table `users_groups_members`
+    #==========================================================================
+    from rhodecode.model.db import UsersGroupMember
+    UsersGroupMember().__table__.create()
+
+    #==========================================================================
+    # Add table `users_group_to_perm`
+    #==========================================================================
+    from rhodecode.model.db import UsersGroupToPerm
+    UsersGroupToPerm().__table__.create()
+
+
+    #==========================================================================
+    # Upgrade of `users` table
+    #==========================================================================
+    from rhodecode.model.db import User
+
+    #add column
+    ldap_dn = Column("ldap_dn", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
+    ldap_dn.create(User().__table__)
+
+
+    #remove old column
+    is_ldap = Column("is_ldap", Boolean(), nullable=False, unique=None, default=False)
+    is_ldap.drop(User().__table__)
+
 
     #==========================================================================
     # Upgrade of `repositories` table
     #==========================================================================    
     from rhodecode.model.db import Repository
 
+    #ADD downloads column#
+    enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
+    enable_downloads.create(Repository().__table__)
+
     #ADD group_id column#
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'),
                   nullable=True, unique=False, default=None)
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -180,7 +180,7 @@ class UsersGroupMember(Base, BaseModel):
     user = relationship('User', lazy='joined')
     users_group = relationship('UsersGroup')
 
-    def __init__(self, gr_id, u_id):
+    def __init__(self, gr_id='', u_id=''):
         self.users_group_id = gr_id
         self.user_id = u_id