From c720f0b581f3e17633bfd33934fabbc405a5af92 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Tue, 28 Jan 2020 20:45:37 -0800 Subject: [PATCH] Add cache table support (WIP) --- babybuddy/management/commands/reset.py | 20 +++++++++----------- babybuddy/settings/base.py | 11 +++++++++++ gulpfile.js | 6 ++++++ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/babybuddy/management/commands/reset.py b/babybuddy/management/commands/reset.py index 1f5a3787..6b8eeda6 100644 --- a/babybuddy/management/commands/reset.py +++ b/babybuddy/management/commands/reset.py @@ -5,9 +5,11 @@ from django.apps import apps from django.contrib.auth import get_user_model from django.core.management.base import BaseCommand, CommandError from django.core.management.commands.flush import Command as Flush -from django.core.management.commands.migrate import Command as Migrate +from django.core.management.commands.createcachetable \ + import Command as CreateCacheTable from .fake import Command as Fake +from .migrate import Command as Migrate class Command(BaseCommand): @@ -25,7 +27,6 @@ class Command(BaseCommand): def handle(self, *args, **options): verbosity = options['verbosity'] - database = options['database'] flush = Flush() flush.handle(**options) @@ -44,21 +45,18 @@ class Command(BaseCommand): # Ignore apps without migrations. pass + # Run migrations. migrate = Migrate() options['app_label'] = None options['migration_name'] = None migrate.handle(*args, **options) - self.UserModel._default_manager.db_manager(database).create_superuser( - **{ - self.UserModel.USERNAME_FIELD: 'admin', - 'email': 'admin@admin.admin', - 'password': 'admin' - } - ) - if verbosity > 0: - self.stdout.write('Superuser created successfully.') + # Create configured cache tables. + create_cache_table = CreateCacheTable() + options['dry_run'] = None + create_cache_table.handle(*args, **options) + # Populate database with fake data. fake = Fake() fake.handle(*args, **options) diff --git a/babybuddy/settings/base.py b/babybuddy/settings/base.py index d99df7e6..36b81b97 100644 --- a/babybuddy/settings/base.py +++ b/babybuddy/settings/base.py @@ -91,6 +91,17 @@ TEMPLATES = [ ] +# Cache +# https://docs.djangoproject.com/en/3.0/topics/cache/ + +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', + 'LOCATION': 'cache_default', + } +} + + # WGSI # https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/ diff --git a/gulpfile.js b/gulpfile.js index 917d9ca6..0e812043 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -208,6 +208,12 @@ gulp.task('compilemessages', function(cb) { spawn('pipenv', command, { stdio: 'inherit' }).on('exit', cb); }); +gulp.task('createcachetable', function(cb) { + var command = ['run', 'python', 'manage.py', 'createcachetable']; + command = command.concat(process.argv.splice(3)); + spawn('pipenv', command, { stdio: 'inherit' }).on('exit', cb); +}); + gulp.task('fake', function(cb) { var command = ['run', 'python', 'manage.py', 'fake']; command = command.concat(process.argv.splice(3));