default permissions can get duplicated after migration from 1.4.X. check and verify again it, notify user that he should re-check it.

--HG--
branch : beta

3 files changed, 39 insertions, 1 deletions

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index dfcf93ce..4b968c4f 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -38,7 +38,7 @@ except ImportError:
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
                '.'.join(VERSION[3:]))
-__dbversion__ = 8  # defines current db version for migrations
+__dbversion__ = 9  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
 __py_version__ = sys.version_info
diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
index e7827a15..872db568 100644
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -276,6 +276,16 @@ class DbManage(object):
                 self.klass.create_default_options(skip_existing=True)
                 Session().commit()
 
+            def step_9(self):
+                perm_fixes = self.klass.reset_permissions(User.DEFAULT_USER)
+                Session().commit()
+                if perm_fixes:
+                    notify('There was an inconsistent state of permissions '
+                           'detected for default user. Permissions are now '
+                           'reset to the default value for default user. '
+                           'Please validate and check default permissions '
+                           'in admin panel')
+
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
 
         # CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
diff --git a/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.py b/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.py
new file mode 100644
index 00000000..44ef4266
--- /dev/null
+++ b/rhodecode/lib/dbmigrate/versions/009_version_1_5_1.py
@@ -0,0 +1,28 @@
+import logging
+import datetime
+
+from sqlalchemy import *
+from sqlalchemy.exc import DatabaseError
+from sqlalchemy.orm import relation, backref, class_mapper, joinedload
+from sqlalchemy.orm.session import Session
+from sqlalchemy.ext.declarative import declarative_base
+
+from rhodecode.lib.dbmigrate.migrate import *
+from rhodecode.lib.dbmigrate.migrate.changeset import *
+
+from rhodecode.model.meta import Base
+from rhodecode.model import meta
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    pass
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine