Merge pull request #123 from ShaheedHaque/master

Size CrontabSchedule fields for max length values.

Author: Omer Katz

django_celery_beat/migrations/0006_auto_20180210_1226.py

@@ -0,0 +1,32 @@
+# Generated by Django 2.0.1 on 2018-02-10 12:26
+from __future__ import absolute_import, unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_celery_beat', '0005_add_solarschedule_events_choices'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='crontabschedule',
+            name='day_of_month',
+            field=models.CharField(default='*', max_length=124,
+                                   verbose_name='day of month'),
+        ),
+        migrations.AlterField(
+            model_name='crontabschedule',
+            name='hour',
+            field=models.CharField(default='*', max_length=96,
+                                   verbose_name='hour'),
+        ),
+        migrations.AlterField(
+            model_name='crontabschedule',
+            name='minute',
+            field=models.CharField(default='*', max_length=240,
+                                   verbose_name='minute'),
+        ),
+    ]

django_celery_beat/models.py

@@ -142,13 +142,20 @@ def period_singular(self):
 class CrontabSchedule(models.Model):
     """Crontab-like schedule."""
 
-    minute = models.CharField(_('minute'), max_length=64, default='*')
-    hour = models.CharField(_('hour'), max_length=64, default='*')
+    #
+    # The worst case scenario for day of month is a list of all 31 day numbers
+    # '[1, 2, ..., 31]' which has a length of 115. Likewise, minute can be
+    # 0..59 and hour can be 0..23. Ensure we can accomodate these by allowing
+    # 4 chars for each value (what we save on 0-9 accomodates the []).
+    # We leave the other fields at their historical length.
+    #
+    minute = models.CharField(_('minute'), max_length=60 * 4, default='*')
+    hour = models.CharField(_('hour'), max_length=24 * 4, default='*')
     day_of_week = models.CharField(
         _('day of week'), max_length=64, default='*',
     )
     day_of_month = models.CharField(
-        _('day of month'), max_length=64, default='*',
+        _('day of month'), max_length=31 * 4, default='*',
     )
     month_of_year = models.CharField(
         _('month of year'), max_length=64, default='*',

t/unit/test_schedulers.py

@@ -436,6 +436,27 @@ def test_CrontabSchedule_schedule(self):
         assert s.schedule.day_of_month == {1, 16}
         assert s.schedule.month_of_year == {1, 7}
 
+    def test_CrontabSchedule_long_schedule(self):
+        s = CrontabSchedule(
+            minute=str(list(range(60)))[1:-1],
+            hour=str(list(range(24)))[1:-1],
+            day_of_week=str(list(range(7)))[1:-1],
+            day_of_month=str(list(range(1, 32)))[1:-1],
+            month_of_year=str(list(range(1, 13)))[1:-1]
+        )
+        assert s.schedule.minute == set(range(60))
+        assert s.schedule.hour == set(range(24))
+        assert s.schedule.day_of_week == set(range(7))
+        assert s.schedule.day_of_month == set(range(1, 32))
+        assert s.schedule.month_of_year == set(range(1, 13))
+        fields = [
+            'minute', 'hour', 'day_of_week', 'day_of_month', 'month_of_year'
+        ]
+        for field in fields:
+            str_length = len(str(getattr(s.schedule, field)))
+            field_length = s._meta.get_field(field).max_length
+            assert str_length <= field_length
+
     def test_SolarSchedule_schedule(self):
         s = SolarSchedule(event='solar_noon', latitude=48.06, longitude=12.86)
         dt = datetime(day=26, month=7, year=2050, hour=1, minute=0)