First set of updates from the major "backendification" rewrite #1
| @ -29,6 +29,6 @@ class Migration(migrations.Migration): | ||||
|         migrations.AddField( | ||||
|             model_name='dispatcheraction', | ||||
|             name='dispatcher', | ||||
|             field=models.ForeignKey(to='dispatch.Dispatcher'), | ||||
|             field=models.ForeignKey(to='dispatch.Dispatcher', on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -17,6 +17,6 @@ class Migration(migrations.Migration): | ||||
|         migrations.AlterField( | ||||
|             model_name='dispatcheraction', | ||||
|             name='dispatcher', | ||||
|             field=models.ForeignKey(related_name='actions', to='dispatch.Dispatcher'), | ||||
|             field=models.ForeignKey(related_name='actions', to='dispatch.Dispatcher', on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -36,7 +36,7 @@ class DispatcherAction(models.Model): | ||||
|         (FILE_TYPE, "Write to file"), | ||||
|     ) | ||||
| 
 | ||||
|     dispatcher = models.ForeignKey('Dispatcher', related_name='actions') | ||||
|     dispatcher = models.ForeignKey('Dispatcher', related_name='actions', on_delete=models.CASCADE) | ||||
|     type = models.CharField(max_length=16, choices=TYPE_CHOICES) | ||||
|     destination = models.CharField(max_length=200) | ||||
|     include_key = models.BooleanField(default=False) | ||||
|  | ||||
| @ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/ | ||||
| # Build paths inside the project like this: os.path.join(BASE_DIR, ...) | ||||
| import os | ||||
| 
 | ||||
| from django.core.urlresolvers import reverse_lazy | ||||
| from django.urls import reverse_lazy | ||||
| 
 | ||||
| BASE_DIR = os.path.dirname(os.path.dirname(__file__)) | ||||
| 
 | ||||
| @ -57,12 +57,11 @@ INSTALLED_APPS = ( | ||||
|     'twitter', | ||||
| ) | ||||
| 
 | ||||
| MIDDLEWARE_CLASSES = ( | ||||
| MIDDLEWARE = ( | ||||
|     'django.contrib.sessions.middleware.SessionMiddleware', | ||||
|     'django.middleware.common.CommonMiddleware', | ||||
|     'django.middleware.csrf.CsrfViewMiddleware', | ||||
|     'django.contrib.auth.middleware.AuthenticationMiddleware', | ||||
|     'django.contrib.auth.middleware.SessionAuthenticationMiddleware', | ||||
|     'django.contrib.messages.middleware.MessageMiddleware', | ||||
|     'django.middleware.clickjacking.XFrameOptionsMiddleware', | ||||
|     'django.middleware.security.SecurityMiddleware', | ||||
|  | ||||
| @ -20,5 +20,5 @@ urlpatterns = [ | ||||
|     url(r'^races/', include('races.urls')), | ||||
| 
 | ||||
|     url(r'^accounts/', include('registration.backends.default.urls')), | ||||
|     url(r'^admin/', include(admin.site.urls)), | ||||
|     url(r'^admin/', admin.site.urls), | ||||
| ] | ||||
|  | ||||
| @ -26,6 +26,6 @@ class Migration(migrations.Migration): | ||||
|         migrations.AddField( | ||||
|             model_name='fact', | ||||
|             name='category', | ||||
|             field=models.ForeignKey(to='facts.FactCategory'), | ||||
|             field=models.ForeignKey(to='facts.FactCategory', on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -52,7 +52,7 @@ class Fact(models.Model): | ||||
|     """Define facts.""" | ||||
| 
 | ||||
|     fact = models.TextField() | ||||
|     category = models.ForeignKey(FactCategory) | ||||
|     category = models.ForeignKey(FactCategory, on_delete=models.CASCADE) | ||||
|     nickmask = models.CharField(max_length=200, default='', blank=True) | ||||
|     time = models.DateTimeField(auto_now_add=True) | ||||
| 
 | ||||
|  | ||||
| @ -27,7 +27,7 @@ class Migration(migrations.Migration): | ||||
|                 ('code_reviews_necessary', models.PositiveSmallIntegerField(default=0)), | ||||
|                 ('code_reviewers', models.TextField(blank=True, default='')), | ||||
|                 ('code_review_final_merge_assignees', models.TextField(blank=True, default='')), | ||||
|                 ('gitlab_config', models.ForeignKey(to='gitlab_bot.GitlabConfig', null=True)), | ||||
|                 ('gitlab_config', models.ForeignKey(to='gitlab_bot.GitlabConfig', null=True, on_delete=models.CASCADE)), | ||||
|             ], | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -23,7 +23,7 @@ class GitlabProjectConfig(models.Model): | ||||
| 
 | ||||
|     """Maintain settings for a particular project in GitLab.""" | ||||
| 
 | ||||
|     gitlab_config = models.ForeignKey('GitlabConfig', null=True) | ||||
|     gitlab_config = models.ForeignKey('GitlabConfig', null=True, on_delete=models.CASCADE) | ||||
|     project_id = models.CharField(max_length=64, unique=True) | ||||
| 
 | ||||
|     manage_merge_request_code_reviews = models.BooleanField(default=False) | ||||
|  | ||||
| @ -15,7 +15,7 @@ class Migration(migrations.Migration): | ||||
|         migrations.AddField( | ||||
|             model_name='botadmin', | ||||
|             name='user', | ||||
|             field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL), | ||||
|             field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE), | ||||
|             preserve_default=False, | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -47,7 +47,7 @@ class BotUser(models.Model): | ||||
|     """Configure bot users, which can do things through the bot and standard Django auth.""" | ||||
| 
 | ||||
|     nickmask = models.CharField(max_length=200, unique=True) | ||||
|     user = models.ForeignKey(settings.AUTH_USER_MODEL) | ||||
|     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) | ||||
| 
 | ||||
|     class Meta: | ||||
|         permissions = ( | ||||
|  | ||||
| @ -23,7 +23,7 @@ class Migration(migrations.Migration): | ||||
|                 ('delta', models.SmallIntegerField()), | ||||
|                 ('nickmask', models.CharField(default='', max_length=200, blank=True)), | ||||
|                 ('created', models.DateTimeField(auto_now_add=True)), | ||||
|                 ('key', models.ForeignKey(to='karma.KarmaKey')), | ||||
|                 ('key', models.ForeignKey(to='karma.KarmaKey', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -115,7 +115,7 @@ class KarmaLogEntryManager(models.Manager): | ||||
| class KarmaLogEntry(models.Model): | ||||
|     """Track each karma increment/decrement.""" | ||||
| 
 | ||||
|     key = models.ForeignKey('KarmaKey') | ||||
|     key = models.ForeignKey('KarmaKey', on_delete=models.CASCADE) | ||||
|     delta = models.SmallIntegerField() | ||||
|     nickmask = models.CharField(max_length=200, default='', blank=True) | ||||
|     created = models.DateTimeField(auto_now_add=True) | ||||
|  | ||||
| @ -27,7 +27,7 @@ class Migration(migrations.Migration): | ||||
|                 ('k2', models.CharField(max_length=128)), | ||||
|                 ('v', models.CharField(max_length=128)), | ||||
|                 ('count', models.IntegerField(default=0)), | ||||
|                 ('context', models.ForeignKey(to='markov.MarkovContext')), | ||||
|                 ('context', models.ForeignKey(to='markov.MarkovContext', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|             options={ | ||||
|                 'permissions': set([('teach_line', 'Can teach lines'), ('import_log_file', 'Can import states from a log file')]), | ||||
| @ -40,7 +40,7 @@ class Migration(migrations.Migration): | ||||
|                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||||
|                 ('name', models.CharField(unique=True, max_length=64)), | ||||
|                 ('chatter_chance', models.IntegerField(default=0)), | ||||
|                 ('context', models.ForeignKey(to='markov.MarkovContext')), | ||||
|                 ('context', models.ForeignKey(to='markov.MarkovContext', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|             options={ | ||||
|             }, | ||||
|  | ||||
| @ -28,7 +28,7 @@ class MarkovTarget(models.Model): | ||||
|     """Define IRC targets that relate to a context, and can occasionally be talked to.""" | ||||
| 
 | ||||
|     name = models.CharField(max_length=200, unique=True) | ||||
|     context = models.ForeignKey(MarkovContext) | ||||
|     context = models.ForeignKey(MarkovContext, on_delete=models.CASCADE) | ||||
| 
 | ||||
|     chatter_chance = models.IntegerField(default=0) | ||||
| 
 | ||||
| @ -51,7 +51,7 @@ class MarkovState(models.Model): | ||||
|     v = models.CharField(max_length=128) | ||||
| 
 | ||||
|     count = models.IntegerField(default=0) | ||||
|     context = models.ForeignKey(MarkovContext) | ||||
|     context = models.ForeignKey(MarkovContext, on_delete=models.CASCADE) | ||||
| 
 | ||||
|     class Meta: | ||||
|         index_together = [ | ||||
|  | ||||
| @ -29,7 +29,7 @@ class Migration(migrations.Migration): | ||||
|                 ('joined', models.BooleanField(default=False)), | ||||
|                 ('started', models.BooleanField(default=False)), | ||||
|                 ('finished', models.BooleanField(default=False)), | ||||
|                 ('race', models.ForeignKey(to='races.Race')), | ||||
|                 ('race', models.ForeignKey(to='races.Race', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|             options={ | ||||
|             }, | ||||
| @ -41,8 +41,8 @@ class Migration(migrations.Migration): | ||||
|                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||||
|                 ('update', models.TextField()), | ||||
|                 ('event_time', models.DateTimeField(default=django.utils.timezone.now)), | ||||
|                 ('race', models.ForeignKey(to='races.Race')), | ||||
|                 ('racer', models.ForeignKey(to='races.Racer')), | ||||
|                 ('race', models.ForeignKey(to='races.Race', on_delete=models.CASCADE)), | ||||
|                 ('racer', models.ForeignKey(to='races.Racer', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|             options={ | ||||
|                 'ordering': ['event_time'], | ||||
|  | ||||
| @ -28,7 +28,7 @@ class Racer(models.Model): | ||||
|     """Track a racer in a race.""" | ||||
| 
 | ||||
|     nick = models.CharField(max_length=64) | ||||
|     race = models.ForeignKey(Race) | ||||
|     race = models.ForeignKey(Race, on_delete=models.CASCADE) | ||||
| 
 | ||||
|     joined = models.BooleanField(default=False) | ||||
|     started = models.BooleanField(default=False) | ||||
| @ -47,8 +47,8 @@ class RaceUpdate(models.Model): | ||||
| 
 | ||||
|     """Periodic updates for a racer.""" | ||||
| 
 | ||||
|     race = models.ForeignKey(Race) | ||||
|     racer = models.ForeignKey(Racer) | ||||
|     race = models.ForeignKey(Race, on_delete=models.CASCADE) | ||||
|     racer = models.ForeignKey(Racer, on_delete=models.CASCADE) | ||||
|     update = models.TextField() | ||||
|     event_time = models.DateTimeField(default=timezone.now) | ||||
| 
 | ||||
|  | ||||
| @ -2,64 +2,68 @@ | ||||
| # This file is autogenerated by pip-compile | ||||
| # To update, run: | ||||
| # | ||||
| #    pip-compile --output-file requirements-dev.txt requirements-dev.in | ||||
| #    pip-compile --output-file=requirements-dev.txt requirements-dev.in | ||||
| # | ||||
| appdirs==1.4.0            # via setuptools | ||||
| astroid==1.4.9            # via pylint, pylint-celery, pylint-flask, pylint-plugin-utils, requirements-detector | ||||
| click==6.7                # via pip-tools | ||||
| astroid==2.2.5            # via pylint, pylint-celery, pylint-flask, requirements-detector | ||||
| certifi==2019.6.16        # via requests | ||||
| chardet==3.0.4            # via requests | ||||
| click==7.0                # via pip-tools | ||||
| django-adminplus==0.5 | ||||
| django-bootstrap3==8.1.0 | ||||
| django-extensions==1.7.6 | ||||
| django-registration-redux==1.4 | ||||
| django==1.10.5 | ||||
| djangorestframework==3.5.3 | ||||
| django-bootstrap3==11.0.0 | ||||
| django-extensions==2.1.9 | ||||
| django-registration-redux==2.6 | ||||
| django==2.2.2 | ||||
| djangorestframework==3.9.4 | ||||
| dodgy==0.1.9              # via prospector | ||||
| first==2.0.1              # via pip-tools | ||||
| future==0.16.0            # via parsedatetime | ||||
| inflect==0.2.5            # via jaraco.itertools | ||||
| irc==15.0.6 | ||||
| isort==4.2.5              # via pylint | ||||
| jaraco.classes==1.4       # via jaraco.collections | ||||
| jaraco.collections==1.5   # via irc, jaraco.text | ||||
| jaraco.functools==1.15.1  # via irc, jaraco.text | ||||
| jaraco.itertools==2.0     # via irc | ||||
| jaraco.logging==1.5       # via irc | ||||
| jaraco.stream==1.1.1      # via irc | ||||
| jaraco.text==1.9          # via irc, jaraco.collections | ||||
| lazy-object-proxy==1.2.2  # via astroid | ||||
| logilab-common==1.3.0 | ||||
| future==0.17.1            # via parsedatetime | ||||
| idna==2.8                 # via requests | ||||
| importlib-metadata==0.18  # via irc | ||||
| inflect==2.1.0            # via jaraco.itertools | ||||
| irc==17.1 | ||||
| isort==4.3.20             # via pylint | ||||
| jaraco.classes==2.0       # via jaraco.collections | ||||
| jaraco.collections==2.0   # via irc | ||||
| jaraco.functools==2.0     # via irc, jaraco.text, tempora | ||||
| jaraco.itertools==4.4.2   # via irc | ||||
| jaraco.logging==2.0       # via irc | ||||
| jaraco.stream==2.0        # via irc | ||||
| jaraco.text==3.0          # via irc, jaraco.collections | ||||
| lazy-object-proxy==1.4.1  # via astroid | ||||
| logilab-common==1.4.2 | ||||
| mccabe==0.6.1             # via prospector, pylint | ||||
| more-itertools==2.5.0     # via irc, jaraco.functools, jaraco.itertools | ||||
| oauthlib==2.0.1           # via requests-oauthlib | ||||
| packaging==16.8           # via setuptools | ||||
| parsedatetime==2.2 | ||||
| more-itertools==7.0.0     # via irc, jaraco.functools, jaraco.itertools | ||||
| oauthlib==3.0.1           # via requests-oauthlib | ||||
| parsedatetime==2.4 | ||||
| pep8-naming==0.4.1        # via prospector | ||||
| pip-tools==1.8.0 | ||||
| ply==3.10 | ||||
| prospector==0.12.4 | ||||
| pycodestyle==2.0.0        # via prospector | ||||
| pydocstyle==1.0.0         # via prospector | ||||
| pyflakes==1.5.0           # via prospector | ||||
| pip-tools==3.8.0 | ||||
| ply==3.11 | ||||
| prospector==1.1.6.4 | ||||
| pycodestyle==2.4.0        # via prospector | ||||
| pydocstyle==3.0.0         # via prospector | ||||
| pyflakes==1.6.0           # via prospector | ||||
| pylint-celery==0.3        # via prospector | ||||
| pylint-common==0.2.2      # via prospector | ||||
| pylint-django==0.7.2      # via prospector | ||||
| pylint-flask==0.5         # via prospector | ||||
| pylint-plugin-utils==0.2.4  # via prospector, pylint-celery, pylint-django, pylint-flask | ||||
| pylint==1.6.5             # via prospector, pylint-celery, pylint-common, pylint-django, pylint-flask, pylint-plugin-utils | ||||
| pyparsing==2.1.10         # via packaging | ||||
| python-dateutil==2.6.0 | ||||
| python-gitlab==0.18 | ||||
| python-mpd2==0.5.5 | ||||
| pytz==2016.10 | ||||
| pyyaml==3.12              # via prospector | ||||
| requests-oauthlib==0.7.0  # via twython | ||||
| requests==2.13.0          # via python-gitlab, requests-oauthlib, twython | ||||
| requirements-detector==0.5.2  # via prospector | ||||
| pylint-django==2.0.9      # via prospector | ||||
| pylint-flask==0.6         # via prospector | ||||
| pylint-plugin-utils==0.5  # via prospector, pylint-celery, pylint-django, pylint-flask | ||||
| pylint==2.3.1             # via prospector, pylint-celery, pylint-django, pylint-flask, pylint-plugin-utils | ||||
| python-dateutil==2.8.0 | ||||
| python-gitlab==1.9.0 | ||||
| python-mpd2==1.0.0 | ||||
| pytz==2019.1 | ||||
| pyyaml==5.1.1             # via prospector | ||||
| requests-oauthlib==1.2.0  # via twython | ||||
| requests==2.22.0          # via python-gitlab, requests-oauthlib, twython | ||||
| requirements-detector==0.6  # via prospector | ||||
| setoptconf==0.2.0         # via prospector | ||||
| six==1.10.0               # via astroid, django-extensions, irc, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, logilab-common, more-itertools, packaging, pip-tools, pylint, python-dateutil, python-gitlab, setuptools, tempora | ||||
| tempora==1.6.1            # via irc, jaraco.logging | ||||
| twython==3.4.0 | ||||
| wrapt==1.10.8             # via astroid | ||||
| six==1.12.0               # via astroid, django-extensions, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, logilab-common, pip-tools, pydocstyle, python-dateutil, python-gitlab, tempora | ||||
| snowballstemmer==1.2.1    # via pydocstyle | ||||
| sqlparse==0.3.0           # via django | ||||
| tempora==1.14.1           # via irc, jaraco.logging | ||||
| twython==3.7.0 | ||||
| typed-ast==1.4.0          # via astroid | ||||
| urllib3==1.25.3           # via requests | ||||
| wrapt==1.11.2             # via astroid | ||||
| zipp==0.5.1               # via importlib-metadata | ||||
| 
 | ||||
| # The following packages are considered to be unsafe in a requirements file: | ||||
| # setuptools                # via logilab-common | ||||
| # setuptools==41.0.1        # via logilab-common | ||||
|  | ||||
| @ -2,34 +2,41 @@ | ||||
| # This file is autogenerated by pip-compile | ||||
| # To update, run: | ||||
| # | ||||
| #    pip-compile --output-file requirements.txt requirements.in | ||||
| #    pip-compile --output-file=requirements.txt requirements.in | ||||
| # | ||||
| certifi==2019.6.16        # via requests | ||||
| chardet==3.0.4            # via requests | ||||
| django-adminplus==0.5 | ||||
| django-bootstrap3==8.1.0 | ||||
| django-extensions==1.7.6 | ||||
| django-registration-redux==1.4 | ||||
| django==1.10.5 | ||||
| djangorestframework==3.5.3 | ||||
| future==0.16.0            # via parsedatetime | ||||
| inflect==0.2.5            # via jaraco.itertools | ||||
| irc==15.0.6 | ||||
| jaraco.classes==1.4       # via jaraco.collections | ||||
| jaraco.collections==1.5   # via irc, jaraco.text | ||||
| jaraco.functools==1.15.1  # via irc, jaraco.text | ||||
| jaraco.itertools==2.0     # via irc | ||||
| jaraco.logging==1.5       # via irc | ||||
| jaraco.stream==1.1.1      # via irc | ||||
| jaraco.text==1.9          # via irc, jaraco.collections | ||||
| more-itertools==2.5.0     # via irc, jaraco.functools, jaraco.itertools | ||||
| oauthlib==2.0.1           # via requests-oauthlib | ||||
| parsedatetime==2.2 | ||||
| ply==3.10 | ||||
| python-dateutil==2.6.0 | ||||
| python-gitlab==0.18 | ||||
| python-mpd2==0.5.5 | ||||
| pytz==2016.10 | ||||
| requests-oauthlib==0.7.0  # via twython | ||||
| requests==2.13.0          # via python-gitlab, requests-oauthlib, twython | ||||
| six==1.10.0               # via django-extensions, irc, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, more-itertools, python-dateutil, python-gitlab, tempora | ||||
| tempora==1.6.1            # via irc, jaraco.logging | ||||
| twython==3.4.0 | ||||
| django-bootstrap3==11.0.0 | ||||
| django-extensions==2.1.9 | ||||
| django-registration-redux==2.6 | ||||
| django==2.2.2 | ||||
| djangorestframework==3.9.4 | ||||
| future==0.17.1            # via parsedatetime | ||||
| idna==2.8                 # via requests | ||||
| importlib-metadata==0.18  # via irc | ||||
| inflect==2.1.0            # via jaraco.itertools | ||||
| irc==17.1 | ||||
| jaraco.classes==2.0       # via jaraco.collections | ||||
| jaraco.collections==2.0   # via irc | ||||
| jaraco.functools==2.0     # via irc, jaraco.text, tempora | ||||
| jaraco.itertools==4.4.2   # via irc | ||||
| jaraco.logging==2.0       # via irc | ||||
| jaraco.stream==2.0        # via irc | ||||
| jaraco.text==3.0          # via irc, jaraco.collections | ||||
| more-itertools==7.0.0     # via irc, jaraco.functools, jaraco.itertools | ||||
| oauthlib==3.0.1           # via requests-oauthlib | ||||
| parsedatetime==2.4 | ||||
| ply==3.11 | ||||
| python-dateutil==2.8.0 | ||||
| python-gitlab==1.9.0 | ||||
| python-mpd2==1.0.0 | ||||
| pytz==2019.1 | ||||
| requests-oauthlib==1.2.0  # via twython | ||||
| requests==2.22.0          # via python-gitlab, requests-oauthlib, twython | ||||
| six==1.12.0               # via django-extensions, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, python-dateutil, python-gitlab, tempora | ||||
| sqlparse==0.3.0           # via django | ||||
| tempora==1.14.1           # via irc, jaraco.logging | ||||
| twython==3.7.0 | ||||
| urllib3==1.25.3           # via requests | ||||
| zipp==0.5.1               # via importlib-metadata | ||||
|  | ||||
| @ -29,7 +29,7 @@ class Migration(migrations.Migration): | ||||
|                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||||
|                 ('line', models.TextField(default='')), | ||||
|                 ('time', models.DateTimeField(auto_now_add=True)), | ||||
|                 ('game', models.ForeignKey(to='storycraft.StorycraftGame')), | ||||
|                 ('game', models.ForeignKey(to='storycraft.StorycraftGame', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|         ), | ||||
|         migrations.CreateModel( | ||||
| @ -38,12 +38,12 @@ class Migration(migrations.Migration): | ||||
|                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||||
|                 ('nick', models.CharField(max_length=64)), | ||||
|                 ('nickmask', models.CharField(max_length=200)), | ||||
|                 ('game', models.ForeignKey(to='storycraft.StorycraftGame')), | ||||
|                 ('game', models.ForeignKey(to='storycraft.StorycraftGame', on_delete=models.CASCADE)), | ||||
|             ], | ||||
|         ), | ||||
|         migrations.AddField( | ||||
|             model_name='storycraftline', | ||||
|             name='player', | ||||
|             field=models.ForeignKey(to='storycraft.StorycraftPlayer'), | ||||
|             field=models.ForeignKey(to='storycraft.StorycraftPlayer', on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -13,16 +13,16 @@ class Migration(migrations.Migration): | ||||
|         migrations.AlterField( | ||||
|             model_name='storycraftline', | ||||
|             name='game', | ||||
|             field=models.ForeignKey(related_name='lines', to='storycraft.StorycraftGame'), | ||||
|             field=models.ForeignKey(related_name='lines', to='storycraft.StorycraftGame', on_delete=models.CASCADE), | ||||
|         ), | ||||
|         migrations.AlterField( | ||||
|             model_name='storycraftline', | ||||
|             name='player', | ||||
|             field=models.ForeignKey(related_name='lines', to='storycraft.StorycraftPlayer'), | ||||
|             field=models.ForeignKey(related_name='lines', to='storycraft.StorycraftPlayer', on_delete=models.CASCADE), | ||||
|         ), | ||||
|         migrations.AlterField( | ||||
|             model_name='storycraftplayer', | ||||
|             name='game', | ||||
|             field=models.ForeignKey(related_name='players', to='storycraft.StorycraftGame'), | ||||
|             field=models.ForeignKey(related_name='players', to='storycraft.StorycraftGame', on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -89,7 +89,7 @@ class StorycraftPlayer(models.Model): | ||||
| 
 | ||||
|     """Contain entire games of storycraft.""" | ||||
| 
 | ||||
|     game = models.ForeignKey('StorycraftGame', related_name='players') | ||||
|     game = models.ForeignKey('StorycraftGame', related_name='players', on_delete=models.CASCADE) | ||||
|     nick = models.CharField(max_length=64) | ||||
|     nickmask = models.CharField(max_length=200) | ||||
| 
 | ||||
| @ -103,8 +103,8 @@ class StorycraftLine(models.Model): | ||||
| 
 | ||||
|     """Handle requests to dispatchers and do something with them.""" | ||||
| 
 | ||||
|     game = models.ForeignKey('StorycraftGame', related_name='lines') | ||||
|     player = models.ForeignKey('StorycraftPlayer', related_name='lines') | ||||
|     game = models.ForeignKey('StorycraftGame', related_name='lines', on_delete=models.CASCADE) | ||||
|     player = models.ForeignKey('StorycraftPlayer', related_name='lines', on_delete=models.CASCADE) | ||||
|     line = models.TextField(default="") | ||||
|     time = models.DateTimeField(auto_now_add=True) | ||||
| 
 | ||||
|  | ||||
| @ -19,6 +19,6 @@ class Migration(migrations.Migration): | ||||
|         migrations.AddField( | ||||
|             model_name='twitterclient', | ||||
|             name='mentions_output_channel', | ||||
|             field=models.ForeignKey(blank=True, related_name='mentions_twitter_client', null=True, to='ircbot.IrcChannel', default=None), | ||||
|             field=models.ForeignKey(blank=True, related_name='mentions_twitter_client', null=True, to='ircbot.IrcChannel', default=None, on_delete=models.CASCADE), | ||||
|         ), | ||||
|     ] | ||||
|  | ||||
| @ -18,7 +18,7 @@ class TwitterClient(models.Model): | ||||
|     oauth_token_secret = models.CharField(max_length=256, default='', blank=True) | ||||
| 
 | ||||
|     mentions_output_channel = models.ForeignKey(IrcChannel, related_name='mentions_twitter_client', default=None, | ||||
|                                                 null=True, blank=True) | ||||
|                                                 null=True, blank=True, on_delete=models.CASCADE) | ||||
|     mentions_since_id = models.PositiveIntegerField(default=1, blank=True) | ||||
| 
 | ||||
|     class Meta: | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user