Merge branch 'release/0.2.6'

klen · Jul 15, 2012 · 65494dc · 65494dc
2 parents f036f1f + e7571de
commit 65494dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Changelog b/Changelog
@@ -1,7 +1,7 @@
 2012-07-15  klen
 
-	* Version 0.2.5
-	* Added wsgi file.
+	* Version 0.2.6
+	* Added wsgi file
 
 2012-07-14  klen
 

diff --git a/base/__init__.py b/base/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.5"
+__version__ = "0.2.6"
diff --git a/base/migrations/0001_initial_data.py b/base/migrations/0001_initial_data.py
@@ -4,7 +4,7 @@
 class Migration(BaseMigration):
 
     def up(self):
-        from base.app import db
+        from base.ext import db
         from base.users.models import Role, User
 
         admin = Role(name='admin')

diff --git a/base/script.py b/base/script.py
@@ -7,15 +7,30 @@ class CreateDB(Command):
     def run(self):
         from base.ext import db
         db.create_all()
+
+        # Evolution support
+        from flask import current_app
+        from flask.ext.evolution import db as evolution_db
+        evolution_db.init_app(current_app)
+        evolution_db.create_all()
+
         print "Database created successfuly"
 
 
 class DropDB(Command):
     " Drops all database tables. "
     def run(self):
         from base.ext import db
+
         if prompt_bool("Are you sure? You will lose all your data!"):
             db.drop_all()
+
+            # Evolution support
+            from flask import current_app
+            from flask.ext.evolution import db as evolution_db
+            evolution_db.init_app(current_app)
+            evolution_db.drop_all()
+
             print "Database clearing"