From 68a50e7d0dc4eb57717a2e16c3ed8ec4a405979a Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 26 May 2021 11:54:27 +0800 Subject: [PATCH 1/2] Fix MySQL max length issue. --- django_celery_beat/migrations/0001_initial.py | 8 +++++++- .../migrations/0010_auto_20190429_0326.py | 12 +++++++++++- django_celery_beat/models.py | 7 ++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/django_celery_beat/migrations/0001_initial.py b/django_celery_beat/migrations/0001_initial.py index 3c8ae4dd..0ff64565 100644 --- a/django_celery_beat/migrations/0001_initial.py +++ b/django_celery_beat/migrations/0001_initial.py @@ -1,5 +1,6 @@ # Generated by Django 1.9.5 on 2016-08-04 02:13 from django.db import migrations, models +from django.conf import settings import django.db.models.deletion @@ -68,7 +69,12 @@ class Migration(migrations.Migration): auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField( - help_text='Useful description', max_length=200, + help_text='Useful description', + max_length=getattr( + settings, + 'DJANGO_CELERY_BEAT_PERIODICTASK_NAME_MAX_LENGTH', + 200 + ), unique=True, verbose_name='name')), ('task', models.CharField( max_length=200, verbose_name='task name')), diff --git a/django_celery_beat/migrations/0010_auto_20190429_0326.py b/django_celery_beat/migrations/0010_auto_20190429_0326.py index ae948ddf..c360aebe 100644 --- a/django_celery_beat/migrations/0010_auto_20190429_0326.py +++ b/django_celery_beat/migrations/0010_auto_20190429_0326.py @@ -5,6 +5,7 @@ import django.core.validators from django.db import migrations, models import django.db.models.deletion +from django.conf import settings import django_celery_beat.validators import timezone_field.fields @@ -114,7 +115,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='periodictask', name='name', - field=models.CharField(help_text='Short Description For This Task', max_length=200, unique=True, verbose_name='Name'), + field=models.CharField( + help_text='Short Description For This Task', + max_length=getattr( + settings, + 'DJANGO_CELERY_BEAT_PERIODICTASK_NAME_MAX_LENGTH', + 200 + ), + unique=True, + verbose_name='Name' + ), ), migrations.AlterField( model_name='periodictask', diff --git a/django_celery_beat/models.py b/django_celery_beat/models.py index 583d8b63..5bd15619 100644 --- a/django_celery_beat/models.py +++ b/django_celery_beat/models.py @@ -386,7 +386,12 @@ class PeriodicTask(models.Model): """Model representing a periodic task.""" name = models.CharField( - max_length=200, unique=True, + max_length=getattr( + settings, + 'DJANGO_CELERY_BEAT_PERIODICTASK_NAME_MAX_LENGTH', + 200 + ), + unique=True, verbose_name=_('Name'), help_text=_('Short Description For This Task'), ) From c30dda7380493366a99c2da497f90d6321b209d2 Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 5 Jun 2021 16:23:08 +0800 Subject: [PATCH 2/2] fix flake8 issues --- django_celery_beat/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_celery_beat/models.py b/django_celery_beat/models.py index 5bd15619..f8d01a8a 100644 --- a/django_celery_beat/models.py +++ b/django_celery_beat/models.py @@ -390,7 +390,7 @@ class PeriodicTask(models.Model): settings, 'DJANGO_CELERY_BEAT_PERIODICTASK_NAME_MAX_LENGTH', 200 - ), + ), unique=True, verbose_name=_('Name'), help_text=_('Short Description For This Task'),