From 7759e481d46c60d129ab2d54f2813ecc27ec8ec6 Mon Sep 17 00:00:00 2001 From: Wookey Date: Tue, 2 Jul 2013 18:13:27 +0100 Subject: Change database syntax to modern format as old style no longer supported in django 1.4 --- databaseReset.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'databaseReset.py') diff --git a/databaseReset.py b/databaseReset.py index 9ba336c..a14a44d 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -11,20 +11,20 @@ from django.core.urlresolvers import reverse from core.models import Cave, Entrance import flatpages.models - +databasename=settings.DATABASES['default']['NAME'] def reload_db(): - if settings.DATABASE_ENGINE == 'sqlite3': + if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3': try: - os.remove(settings.DATABASE_NAME) + os.remove(databasename) except OSError: pass else: cursor = connection.cursor() - cursor.execute("DROP DATABASE %s" % settings.DATABASE_NAME) - cursor.execute("CREATE DATABASE %s" % settings.DATABASE_NAME) - cursor.execute("ALTER DATABASE %s CHARACTER SET=utf8" % settings.DATABASE_NAME) - cursor.execute("USE %s" % settings.DATABASE_NAME) + cursor.execute("DROP DATABASE %s" % databasename) + cursor.execute("CREATE DATABASE %s" % databasename) + cursor.execute("ALTER DATABASE %s CHARACTER SET=utf8" % databasename) + cursor.execute("USE %s" % databasename) management.call_command('syncdb', interactive=False) user = User.objects.create_user('expo', 'goatchurch@gmail.com', 'gosser') user.is_staff = True -- cgit v1.2.3