New url dispatcher OK 1.9.13

databaseReset.py

@@ -8,25 +8,34 @@ import settings
 os.environ['PYTHONPATH'] = settings.PYTHON_PATH
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
 
-import django
-from django.core import management
-from django.db import connection, close_old_connections, connections
-from django.contrib.auth.models import User
-from django.http import HttpResponse
-from django.core.urlresolvers import reverse
-
 print(" - settings on loading databaseReset.py")
 
-from troggle.core.models_caves import Cave, Entrance
+
+import django
+print(" - django.setup - next")
+try:
+    django.setup()
+except:
+    print(" ! Cyclic reference failure. Can occur when the initial db is empty. Fixed now (in UploadFileForm) but easy to reintroduce..")
+    raise
+print(" - django.setup - done")
+
 import troggle.flatpages.models
-import troggle.logbooksdump
-
-from troggle.parsers.imports import import_caves, import_people, import_surveyscans, \
-        import_logbooks, import_QMs, import_survex, import_tunnelfiles
-
 import troggle.core.models
 import troggle.core.models_survex
 
+from django.core import management
+from django.db import connection, close_old_connections, connections
+from django.http import HttpResponse
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+
+from troggle.core.models_caves import Cave, Entrance
+from troggle.parsers.imports import import_caves, import_people, import_surveyscans, \
+        import_logbooks, import_QMs, import_survex, import_tunnelfiles
+import troggle.logbooksdump
+
+
 # NOTE databaseReset.py is *imported* by views_other.py as it is used in the control panel
 # presented there.
 
@@ -80,7 +89,12 @@ def reinit_db():
      #Sync user - needed after reload
     print(" - Migrating: " + django.db.connections.databases['default']['NAME'])
 
+    management.call_command('makemigrations','core', interactive=False)
+    management.call_command('makemigrations','flatpages', interactive=False)
     management.call_command('migrate', interactive=False)
+    management.call_command('migrate','core', interactive=False)
+    management.call_command('migrate','flatpages', interactive=False)
+    
     print(" - done migration on: " + settings.DATABASES['default']['NAME'])
     print("users in db already: ",len(User.objects.all()))
     try:
@@ -467,13 +481,6 @@ if __name__ == "__main__":
 
     store_dbsettings()
     #set_in_memory_dbsettings()
-    print(" - django.setup - next")
-    try:
-        django.setup()
-    except:
-        print(" ! Cyclic reference failure. Can occur when the initial db is empty. Fixed now (in UploadFileForm) but easy to reintroduce..")
-        raise
-    print(" - django.setup - done")
     
     #set_in_memory_dbsettings() # seems to be ignored. Appears to be set but in reality.
     #jq.run_now_django_tests(1) # actually does set db to :memory: - but invisibly !