diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 8f49234..15c7913 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2020-07-20 10:25 +# Generated by Django 1.11.29 on 2020-07-20 22:32 from __future__ import unicode_literals from django.conf import settings @@ -324,7 +324,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=100)), - ('title', models.CharField(max_length=100)), + ('title', models.CharField(max_length=200)), ('date', models.DateField(blank=True, null=True)), ('survexpath', models.CharField(max_length=200)), ('legsall', models.IntegerField(null=True)), diff --git a/flatpages/migrations/0001_initial.py b/flatpages/migrations/0001_initial.py index 0301f11..89495e9 100644 --- a/flatpages/migrations/0001_initial.py +++ b/flatpages/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2020-07-20 10:25 +# Generated by Django 1.11.29 on 2020-07-20 22:32 from __future__ import unicode_literals from django.db import migrations, models diff --git a/lines-of-python.txt b/lines-of-python.txt index 317deb6..16ca28a 100644 --- a/lines-of-python.txt +++ b/lines-of-python.txt @@ -2,54 +2,53 @@ 4 ./flatpages/admin.py 6 ./core/templatetags/link.py 6 ./core/views.py -6 ./manage.py 8 ./core/templatetags/csrffaker.py 10 ./flatpages/models.py -10 ./helper/__init__.py 10 ./wsgi.py +14 ./helper/__init__.py +16 ./manage.py 26 ./core/management/commands/reset_db.py 26 ./export/toqms.py 33 ./localsettingswindows.py 37 ./localsettingsubuntu.py 38 ./profiles/urls.py 38 ./profiles/utils.py -39 ./localsettings-expo-live.py 39 ./localsettingsdocker.py 39 ./localsettingsserver.py 41 ./localsettingspotatohut.py -41 ./middleware.py -44 ./dump.py +43 ./middleware.py 48 ./core/templatetags/survex_markup.py 48 ./parsers/imports.py 48 ./parsers/subcaves.py -52 ./reset-django.py -63 ./logbooksdump.py -68 ./urls.py -71 ./core/TESTS/tests.py -73 ./localsettings.py -73 ./localsettingsWSL.py +54 ./dump.py +58 ./reset-django.py +69 ./logbooksdump.py 73 ./settings.py -78 ./core/views_statistics.py +76 ./localsettings.py +77 ./core/views_statistics.py +79 ./urls.py +82 ./localsettingsWSL.py 97 ./core/forms.py 97 ./core/view_surveys.py 98 ./core/admin.py 102 ./parsers/people.py 105 ./parsers/QMs.py +108 ./core/TESTS/tests.py 124 ./core/templatetags/wiki_markup.py 142 ./core/models_survex.py -144 ./utils.py 148 ./parsers/surveys.py +153 ./utils.py 164 ./flatpages/views.py 164 ./modelviz.py 170 ./core/models.py -175 ./core/views_other.py +181 ./core/views_other.py 190 ./core/views_logbooks.py 247 ./parsers/caves.py 262 ./core/views_survex.py 276 ./profiles/views.py -291 ./databaseReset.py +309 ./databaseReset.py 401 ./core/views_caves.py 497 ./parsers/logbooks.py 593 ./core/models_caves.py -1042 ./parsers/survex.py -6729 +1059 ./parsers/survex.py +6837 diff --git a/lines-of-templates.txt b/lines-of-templates.txt index 31b2790..55cce9d 100644 --- a/lines-of-templates.txt +++ b/lines-of-templates.txt @@ -26,8 +26,8 @@ 17 ./templates/editcave2.html 19 ./templates/cavemillenial.html 19 ./templates/registration/activate.html -20 ./templates/cave_qms.html 20 ./templates/cavebase.html +20 ./templates/cave_qms.html 20 ./templates/plainbase.html 21 ./templates/logbook2005style.html 24 ./README/index.html diff --git a/pre-run.sh b/pre-run.sh old mode 100644 new mode 100755 index d00d548..c930b21 --- a/pre-run.sh +++ b/pre-run.sh @@ -2,7 +2,7 @@ # Do these before final testing, *not* just before pushing: # Philip Sargent 2020/06/20 echo Run inspectdb: -python manage.py inspectdb > troggle-inspectdb.py +python3 manage.py inspectdb > troggle-inspectdb.py # egrep -in "unable|error" troggle-inspectdb.py echo "" # count non-blank lines of python and template HTML code @@ -13,11 +13,11 @@ find . -name \*.py -print0 | xargs -0 egrep -vc "#|^\s*$" | grep -v ":0$" | gr # This deletes the database so must run after generating troggle-inspectdb.py -python reset-django.py +python3 reset-django.py echo After cleanup deletion, remake all migrations. -python manage.py makemigrations >/dev/null -python manage.py test -python manage.py check -v 3 --deploy 2>security-warnings.txt >/dev/null -python manage.py check -v 3 --deploy +python3 manage.py makemigrations >/dev/null +python3 manage.py test +python3 manage.py check -v 3 --deploy 2>security-warnings.txt >/dev/null +python3 manage.py check -v 3 --deploy echo "" -echo `tail -1 lines-of-python.txt` non-comment lines of python. \ No newline at end of file +echo `tail -1 lines-of-python.txt` non-comment lines of python. diff --git a/troggle-inspectdb.py b/troggle-inspectdb.py index 266077a..38f3dbb 100644 --- a/troggle-inspectdb.py +++ b/troggle-inspectdb.py @@ -1,6 +1,5 @@ * importing troggle/settings.py * importing troggle/localsettings.py - + finished importing troggle/localsettings.py + finished importing troggle/settings.py * importing troggle/settings.py + finished importing troggle/settings.py @@ -20,21 +19,27 @@ from django.db import models class AuthGroup(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? name = models.CharField(unique=True, max_length=80) class Meta: managed = False db_table = 'auth_group' -# Unable to inspect table 'auth_group_permissions' -# The error was: list index out of range + + +class AuthGroupPermissions(models.Model): + group = models.ForeignKey(AuthGroup, models.DO_NOTHING) + permission = models.ForeignKey('AuthPermission', models.DO_NOTHING) + + class Meta: + managed = False + db_table = 'auth_group_permissions' + unique_together = (('group', 'permission'),) class AuthPermission(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? + name = models.CharField(max_length=255) content_type = models.ForeignKey('DjangoContentType', models.DO_NOTHING) codename = models.CharField(max_length=100) - name = models.CharField(max_length=255) class Meta: managed = False @@ -43,31 +48,45 @@ class AuthPermission(models.Model): class AuthUser(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? password = models.CharField(max_length=128) last_login = models.DateTimeField(blank=True, null=True) - is_superuser = models.BooleanField() + is_superuser = models.IntegerField() + username = models.CharField(unique=True, max_length=150) first_name = models.CharField(max_length=30) last_name = models.CharField(max_length=30) email = models.CharField(max_length=254) - is_staff = models.BooleanField() - is_active = models.BooleanField() + is_staff = models.IntegerField() + is_active = models.IntegerField() date_joined = models.DateTimeField() - username = models.CharField(unique=True, max_length=150) class Meta: managed = False db_table = 'auth_user' -# Unable to inspect table 'auth_user_groups' -# The error was: list index out of range -# Unable to inspect table 'auth_user_user_permissions' -# The error was: list index out of range + + +class AuthUserGroups(models.Model): + user = models.ForeignKey(AuthUser, models.DO_NOTHING) + group = models.ForeignKey(AuthGroup, models.DO_NOTHING) + + class Meta: + managed = False + db_table = 'auth_user_groups' + unique_together = (('user', 'group'),) + + +class AuthUserUserPermissions(models.Model): + user = models.ForeignKey(AuthUser, models.DO_NOTHING) + permission = models.ForeignKey(AuthPermission, models.DO_NOTHING) + + class Meta: + managed = False + db_table = 'auth_user_user_permissions' + unique_together = (('user', 'permission'),) class CoreArea(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() short_name = models.CharField(max_length=100) name = models.CharField(max_length=200, blank=True, null=True) description = models.TextField(blank=True, null=True) @@ -79,9 +98,8 @@ class CoreArea(models.Model): class CoreCave(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() official_name = models.CharField(max_length=160) kataster_code = models.CharField(max_length=20, blank=True, null=True) kataster_number = models.CharField(max_length=10, blank=True, null=True) @@ -108,7 +126,6 @@ class CoreCave(models.Model): class CoreCaveArea(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? cave = models.ForeignKey(CoreCave, models.DO_NOTHING) area = models.ForeignKey(CoreArea, models.DO_NOTHING) @@ -119,7 +136,6 @@ class CoreCaveArea(models.Model): class CoreCaveandentrance(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? entrance_letter = models.CharField(max_length=20, blank=True, null=True) cave = models.ForeignKey(CoreCave, models.DO_NOTHING) entrance = models.ForeignKey('CoreEntrance', models.DO_NOTHING) @@ -130,9 +146,8 @@ class CoreCaveandentrance(models.Model): class CoreCavedescription(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() short_name = models.CharField(unique=True, max_length=50) long_name = models.CharField(max_length=200, blank=True, null=True) description = models.TextField(blank=True, null=True) @@ -143,7 +158,6 @@ class CoreCavedescription(models.Model): class CoreCavedescriptionLinkedEntrances(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? cavedescription = models.ForeignKey(CoreCavedescription, models.DO_NOTHING) entrance = models.ForeignKey('CoreEntrance', models.DO_NOTHING) @@ -154,7 +168,6 @@ class CoreCavedescriptionLinkedEntrances(models.Model): class CoreCavedescriptionLinkedQms(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? cavedescription = models.ForeignKey(CoreCavedescription, models.DO_NOTHING) qm = models.ForeignKey('CoreQm', models.DO_NOTHING) @@ -165,7 +178,6 @@ class CoreCavedescriptionLinkedQms(models.Model): class CoreCavedescriptionLinkedSubcaves(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? cavedescription = models.ForeignKey(CoreCavedescription, models.DO_NOTHING) newsubcave = models.ForeignKey('CoreNewsubcave', models.DO_NOTHING) @@ -176,9 +188,8 @@ class CoreCavedescriptionLinkedSubcaves(models.Model): class CoreCaveslug(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? slug = models.CharField(unique=True, max_length=50) - primary = models.BooleanField() + primary = models.IntegerField() cave = models.ForeignKey(CoreCave, models.DO_NOTHING) class Meta: @@ -187,9 +198,8 @@ class CoreCaveslug(models.Model): class CoreDataissue(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() date = models.DateTimeField() parser = models.CharField(max_length=50, blank=True, null=True) message = models.CharField(max_length=400, blank=True, null=True) @@ -200,9 +210,8 @@ class CoreDataissue(models.Model): class CoreEntrance(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() name = models.CharField(max_length=100, blank=True, null=True) entrance_description = models.TextField(blank=True, null=True) explorers = models.TextField(blank=True, null=True) @@ -233,9 +242,8 @@ class CoreEntrance(models.Model): class CoreEntranceslug(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? slug = models.CharField(unique=True, max_length=50) - primary = models.BooleanField() + primary = models.IntegerField() entrance = models.ForeignKey(CoreEntrance, models.DO_NOTHING) class Meta: @@ -244,9 +252,8 @@ class CoreEntranceslug(models.Model): class CoreExpedition(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() year = models.CharField(unique=True, max_length=20) name = models.CharField(max_length=100) @@ -256,9 +263,8 @@ class CoreExpedition(models.Model): class CoreExpeditionday(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() date = models.DateField() expedition = models.ForeignKey(CoreExpedition, models.DO_NOTHING) @@ -268,9 +274,8 @@ class CoreExpeditionday(models.Model): class CoreLogbookentry(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() date = models.DateField() title = models.CharField(max_length=200) cave_slug = models.CharField(max_length=50, blank=True, null=True) @@ -288,9 +293,8 @@ class CoreLogbookentry(models.Model): class CoreNewsubcave(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() name = models.CharField(unique=True, max_length=200) class Meta: @@ -299,9 +303,8 @@ class CoreNewsubcave(models.Model): class CoreOthercavename(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() name = models.CharField(max_length=160) cave = models.ForeignKey(CoreCave, models.DO_NOTHING) @@ -311,13 +314,12 @@ class CoreOthercavename(models.Model): class CorePerson(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() first_name = models.CharField(max_length=100) last_name = models.CharField(max_length=100) fullname = models.CharField(max_length=200) - is_vfho = models.BooleanField() + is_vfho = models.IntegerField() mug_shot = models.CharField(max_length=100, blank=True, null=True) blurb = models.TextField(blank=True, null=True) orderref = models.CharField(max_length=200) @@ -329,11 +331,10 @@ class CorePerson(models.Model): class CorePersonexpedition(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() slugfield = models.CharField(max_length=50, blank=True, null=True) - is_guest = models.BooleanField() + is_guest = models.IntegerField() expo_committee_position = models.CharField(max_length=200, blank=True, null=True) nickname = models.CharField(max_length=100, blank=True, null=True) expedition = models.ForeignKey(CoreExpedition, models.DO_NOTHING) @@ -345,11 +346,10 @@ class CorePersonexpedition(models.Model): class CorePersontrip(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() time_underground = models.FloatField() - is_logbook_entry_author = models.BooleanField() + is_logbook_entry_author = models.IntegerField() logbook_entry = models.ForeignKey(CoreLogbookentry, models.DO_NOTHING) personexpedition = models.ForeignKey(CorePersonexpedition, models.DO_NOTHING, blank=True, null=True) @@ -359,9 +359,8 @@ class CorePersontrip(models.Model): class CoreQm(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? - new_since_parsing = models.BooleanField() - non_public = models.BooleanField() + new_since_parsing = models.IntegerField() + non_public = models.IntegerField() number = models.IntegerField() grade = models.CharField(max_length=1) location_description = models.TextField() @@ -380,7 +379,6 @@ class CoreQm(models.Model): class CoreScansfolder(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? fpath = models.CharField(max_length=200) walletname = models.CharField(max_length=200) @@ -390,7 +388,6 @@ class CoreScansfolder(models.Model): class CoreSinglescan(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? ffile = models.CharField(max_length=200) name = models.CharField(max_length=200) scansfolder = models.ForeignKey(CoreScansfolder, models.DO_NOTHING, blank=True, null=True) @@ -401,7 +398,6 @@ class CoreSinglescan(models.Model): class CoreSurvexblock(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? name = models.CharField(max_length=100) title = models.CharField(max_length=100) date = models.DateField(blank=True, null=True) @@ -411,9 +407,9 @@ class CoreSurvexblock(models.Model): cave = models.ForeignKey(CoreCave, models.DO_NOTHING, blank=True, null=True) expedition = models.ForeignKey(CoreExpedition, models.DO_NOTHING, blank=True, null=True) expeditionday = models.ForeignKey(CoreExpeditionday, models.DO_NOTHING, blank=True, null=True) + parent = models.ForeignKey('self', models.DO_NOTHING, blank=True, null=True) scansfolder = models.ForeignKey(CoreScansfolder, models.DO_NOTHING, blank=True, null=True) survexfile = models.ForeignKey('CoreSurvexfile', models.DO_NOTHING, blank=True, null=True) - parent = models.ForeignKey('self', models.DO_NOTHING, blank=True, null=True) class Meta: managed = False @@ -421,7 +417,6 @@ class CoreSurvexblock(models.Model): class CoreSurvexdirectory(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? path = models.CharField(max_length=200) cave = models.ForeignKey(CoreCave, models.DO_NOTHING, blank=True, null=True) primarysurvexfile = models.ForeignKey('CoreSurvexfile', models.DO_NOTHING, blank=True, null=True) @@ -429,21 +424,58 @@ class CoreSurvexdirectory(models.Model): class Meta: managed = False db_table = 'core_survexdirectory' -# Unable to inspect table 'core_survexfile' -# The error was: list index out of range -# Unable to inspect table 'core_survexpersonrole' -# The error was: list index out of range -# Unable to inspect table 'core_survexstation' -# The error was: list index out of range -# Unable to inspect table 'core_survextitle' -# The error was: list index out of range + + +class CoreSurvexfile(models.Model): + path = models.CharField(max_length=200) + cave = models.ForeignKey(CoreCave, models.DO_NOTHING, blank=True, null=True) + survexdirectory = models.ForeignKey(CoreSurvexdirectory, models.DO_NOTHING, blank=True, null=True) + + class Meta: + managed = False + db_table = 'core_survexfile' + + +class CoreSurvexpersonrole(models.Model): + nrole = models.CharField(max_length=200, blank=True, null=True) + personname = models.CharField(max_length=100) + expeditionday = models.ForeignKey(CoreExpeditionday, models.DO_NOTHING, blank=True, null=True) + person = models.ForeignKey(CorePerson, models.DO_NOTHING, blank=True, null=True) + personexpedition = models.ForeignKey(CorePersonexpedition, models.DO_NOTHING, blank=True, null=True) + persontrip = models.ForeignKey(CorePersontrip, models.DO_NOTHING, blank=True, null=True) + survexblock = models.ForeignKey(CoreSurvexblock, models.DO_NOTHING) + + class Meta: + managed = False + db_table = 'core_survexpersonrole' + + +class CoreSurvexstation(models.Model): + name = models.CharField(max_length=100) + x = models.FloatField(blank=True, null=True) + y = models.FloatField(blank=True, null=True) + z = models.FloatField(blank=True, null=True) + block = models.ForeignKey(CoreSurvexblock, models.DO_NOTHING, blank=True, null=True) + + class Meta: + managed = False + db_table = 'core_survexstation' + + +class CoreSurvextitle(models.Model): + title = models.CharField(max_length=200) + cave = models.ForeignKey(CoreCave, models.DO_NOTHING, blank=True, null=True) + survexblock = models.ForeignKey(CoreSurvexblock, models.DO_NOTHING, blank=True, null=True) + + class Meta: + managed = False + db_table = 'core_survextitle' class CoreTunnelfile(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? tunnelpath = models.CharField(max_length=200) tunnelname = models.CharField(max_length=200) - bfontcolours = models.BooleanField() + bfontcolours = models.IntegerField() filesize = models.IntegerField() npaths = models.IntegerField() @@ -453,7 +485,6 @@ class CoreTunnelfile(models.Model): class CoreTunnelfileManyscansfolders(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? tunnelfile = models.ForeignKey(CoreTunnelfile, models.DO_NOTHING) scansfolder = models.ForeignKey(CoreScansfolder, models.DO_NOTHING) @@ -464,7 +495,6 @@ class CoreTunnelfileManyscansfolders(models.Model): class CoreTunnelfileScans(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? tunnelfile = models.ForeignKey(CoreTunnelfile, models.DO_NOTHING) singlescan = models.ForeignKey(CoreSinglescan, models.DO_NOTHING) @@ -475,9 +505,8 @@ class CoreTunnelfileScans(models.Model): class CoreTunnelfileSurvexfiles(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? tunnelfile = models.ForeignKey(CoreTunnelfile, models.DO_NOTHING) - survexfile = models.ForeignKey('CoreSurvexfile', models.DO_NOTHING) + survexfile = models.ForeignKey(CoreSurvexfile, models.DO_NOTHING) class Meta: managed = False @@ -486,7 +515,6 @@ class CoreTunnelfileSurvexfiles(models.Model): class CoreTunnelfileTunnelcontains(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? from_tunnelfile = models.ForeignKey(CoreTunnelfile, models.DO_NOTHING) to_tunnelfile = models.ForeignKey(CoreTunnelfile, models.DO_NOTHING) @@ -494,12 +522,23 @@ class CoreTunnelfileTunnelcontains(models.Model): managed = False db_table = 'core_tunnelfile_tunnelcontains' unique_together = (('from_tunnelfile', 'to_tunnelfile'),) -# Unable to inspect table 'django_admin_log' -# The error was: list index out of range + + +class DjangoAdminLog(models.Model): + action_time = models.DateTimeField() + object_id = models.TextField(blank=True, null=True) + object_repr = models.CharField(max_length=200) + action_flag = models.SmallIntegerField() + change_message = models.TextField() + content_type = models.ForeignKey('DjangoContentType', models.DO_NOTHING, blank=True, null=True) + user = models.ForeignKey(AuthUser, models.DO_NOTHING) + + class Meta: + managed = False + db_table = 'django_admin_log' class DjangoContentType(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? app_label = models.CharField(max_length=100) model = models.CharField(max_length=100) @@ -510,7 +549,6 @@ class DjangoContentType(models.Model): class DjangoMigrations(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? app = models.CharField(max_length=255) name = models.CharField(max_length=255) applied = models.DateTimeField() @@ -531,7 +569,6 @@ class DjangoSession(models.Model): class FlatpagesEntranceredirect(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? originalurl = models.CharField(db_column='originalURL', max_length=200) # Field name made lowercase. entrance = models.ForeignKey(CoreEntrance, models.DO_NOTHING) @@ -541,7 +578,6 @@ class FlatpagesEntranceredirect(models.Model): class FlatpagesRedirect(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? originalurl = models.CharField(db_column='originalURL', unique=True, max_length=200) # Field name made lowercase. newurl = models.CharField(db_column='newURL', max_length=200) # Field name made lowercase. @@ -551,7 +587,6 @@ class FlatpagesRedirect(models.Model): class RegistrationRegistrationprofile(models.Model): - id = models.IntegerField(primary_key=True) # AutoField? activation_key = models.CharField(max_length=40) user = models.ForeignKey(AuthUser, models.DO_NOTHING, unique=True)