summaryrefslogtreecommitdiffstats
path: root/databaseReset.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip@Muscogee.localdomain>2020-05-13 21:25:17 +0100
committerPhilip Sargent <philip@Muscogee.localdomain>2020-05-13 21:25:17 +0100
commitf326bf9148bfb9447abbdc9f2e42771125288865 (patch)
tree36dfc6597bc05c9972c96d39893c235a5cf8c3d0 /databaseReset.py
parentb1596c0ac4faddec1e41fbb7d9305c741f2392a7 (diff)
downloadtroggle-f326bf9148bfb9447abbdc9f2e42771125288865.tar.gz
troggle-f326bf9148bfb9447abbdc9f2e42771125288865.tar.bz2
troggle-f326bf9148bfb9447abbdc9f2e42771125288865.zip
more thorough reset between dbs
Diffstat (limited to 'databaseReset.py')
-rw-r--r--databaseReset.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/databaseReset.py b/databaseReset.py
index 455de8d..04b8f98 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -252,10 +252,12 @@ class JobQueue():
dbengine = settings.DATABASES['default']['ENGINE']
dbname = settings.DATABASES['default']['NAME']
+ dbdefault = settings.DATABASES['default']
if dbname ==":memory:":
# just run, and save the sql file
print "-- ", settings.DATABASES['default']['NAME'], settings.DATABASES['default']['ENGINE']
+ print "-- DATABASES.default", settings.DATABASES['default']
self.runqonce()
self.memdumpsql()
self.saveprofiles()
@@ -263,7 +265,11 @@ class JobQueue():
# run all the imports through :memory: first
settings.DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
settings.DATABASES['default']['NAME'] = ":memory:"
+ settings.DATABASES['default']['USER'] = ""
+ settings.DATABASES['default']['PASSWORD'] = ""
+
print "-- ", settings.DATABASES['default']['NAME'], settings.DATABASES['default']['ENGINE']
+ print "-- DATABASES.default", settings.DATABASES['default']
# but because the user may be expecting to add this to a db with lots of tables already there,
# the jobque may not start from scratch so we need to initialise the db properly first
@@ -287,6 +293,7 @@ class JobQueue():
# restore the original db and import again
# if we wanted to, we could re-import the SQL generated in the first pass to be
# blazing fast. But for the present just re-import the lot.
+ settings.DATABASES['default'] = dbdefault
settings.DATABASES['default']['ENGINE'] = dbengine
settings.DATABASES['default']['NAME'] = dbname
print "-- ", settings.DATABASES['default']['NAME'], settings.DATABASES['default']['ENGINE']