Updated to current hg head of mumble-django

mumble/management/__init__.py

@@ -14,9 +14,43 @@
  *  GNU General Public License for more details.
 """
 
-from server_detect		import find_existing_instances
-from django.db.models		import signals
-from mumble			import models
+from shutil		import copy, move
+from os.path		import exists, join
+
+from django.conf	import settings
+from django.db		import connection
+from django.db.models	import signals
+
+from mumble		import models
+
+from update_schema	import update_schema
+from server_detect	import find_existing_instances
+
+
+if settings.DATABASE_ENGINE == "sqlite3":
+	# Move the DB to the db subdirectory if necessary.
+	oldpath = join( settings.MUMBLE_DJANGO_ROOT, "mumble-django.db3" )
+	if not exists( settings.DATABASE_NAME ) and exists( oldpath ):
+		move( oldpath, settings.DATABASE_NAME )
+
+
+cursor = connection.cursor()
+
+tablename = models.Mumble._meta.db_table
+
+if tablename in connection.introspection.get_table_list(cursor):
+	fields = connection.introspection.get_table_description(cursor, tablename)
+	uptodate = "server_id" in [ entry[0] for entry in fields ]
+else:
+	# Table doesn't yet exist, so syncdb will create it properly
+	uptodate = True
+
+if not uptodate:
+	if settings.DATABASE_ENGINE == "sqlite3":
+		# backup the db before the conversion.
+		copy( settings.DATABASE_NAME, settings.DATABASE_NAME+".bak" )
+	signals.post_syncdb.connect( update_schema, sender=models );
+else:
+	signals.post_syncdb.connect( find_existing_instances, sender=models );
 
-signals.post_syncdb.connect( find_existing_instances, sender=models );