Skip to content

Commit f6628b4

Browse files
pdelbocapdelboca
committed
Delete and re-do all migrations.
It was a mistake to use hierarchy in models and since no one is using it's easier to just remove and start again.
1 parent ac43c57 commit f6628b4

File tree

5 files changed

+79
-183
lines changed

5 files changed

+79
-183
lines changed

‎dcat/migrations/0001_initial.py

Lines changed: 68 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Generated by Django 5.0 on 2023-12-06 14:18
1+
# Generated by Django 5.0 on 2023-12-18 20:23
22

3+
import dcat.models
34
import django.db.models.deletion
45
from django.db import migrations, models
56

@@ -23,23 +24,12 @@ class Migration(migrations.Migration):
2324
),
2425
),
2526
("name", models.CharField(max_length=255)),
26-
(
27-
"type",
28-
models.CharField(
29-
choices=[
30-
("ORGANIZATION", "Organization"),
31-
("PERSON", "Person"),
32-
("OTHER", "Other"),
33-
],
34-
default="ORGANIZATION",
35-
max_length=20,
36-
),
37-
),
27+
("type", models.CharField(max_length=20)),
3828
("mbox", models.EmailField(blank=True, max_length=254, null=True)),
3929
],
4030
),
4131
migrations.CreateModel(
42-
name="Resource",
32+
name="Checksum",
4333
fields=[
4434
(
4535
"id",
@@ -50,6 +40,8 @@ class Migration(migrations.Migration):
5040
verbose_name="ID",
5141
),
5242
),
43+
("checksum_value", models.CharField(max_length=255)),
44+
("algorithm", models.CharField(max_length=10)),
5345
],
5446
),
5547
migrations.CreateModel(
@@ -66,7 +58,7 @@ class Migration(migrations.Migration):
6658
),
6759
("code", models.CharField(max_length=10)),
6860
("label", models.CharField(max_length=255)),
69-
("description", models.TextField(blank=True, null=True)),
61+
("description", models.TextField(blank=True, default="")),
7062
],
7163
),
7264
migrations.CreateModel(
@@ -81,10 +73,13 @@ class Migration(migrations.Migration):
8173
verbose_name="ID",
8274
),
8375
),
84-
("code", models.CharField(max_length=10, unique=True)),
8576
("label", models.CharField(max_length=255)),
86-
("url_general", models.URLField(null=True)),
87-
("url_document", models.URLField(null=True)),
77+
(
78+
"code",
79+
models.CharField(blank=True, max_length=10, null=True, unique=True),
80+
),
81+
("url_general", models.URLField(blank=True, default="")),
82+
("url_document", models.URLField(blank=True, default="")),
8883
],
8984
),
9085
migrations.CreateModel(
@@ -99,33 +94,48 @@ class Migration(migrations.Migration):
9994
verbose_name="ID",
10095
),
10196
),
102-
("code", models.CharField(max_length=10)),
10397
("extension", models.CharField(max_length=10)),
104-
("media_type", models.CharField(max_length=50)),
105-
("description", models.TextField()),
98+
(
99+
"code",
100+
models.CharField(blank=True, max_length=10, null=True, unique=True),
101+
),
102+
("media_type", models.CharField(blank=True, max_length=50)),
103+
("description", models.TextField(blank=True)),
106104
],
107105
),
108106
migrations.CreateModel(
109-
name="Dataset",
107+
name="Catalog",
110108
fields=[
111109
(
112-
"resource_ptr",
113-
models.OneToOneField(
110+
"id",
111+
models.BigAutoField(
114112
auto_created=True,
115-
on_delete=django.db.models.deletion.CASCADE,
116-
parent_link=True,
117113
primary_key=True,
118114
serialize=False,
119-
to="dcat.resource",
115+
verbose_name="ID",
120116
),
121117
),
122118
("title", models.CharField(max_length=255)),
123119
("description", models.TextField()),
120+
(
121+
"publisher",
122+
models.ForeignKey(
123+
on_delete=django.db.models.deletion.CASCADE, to="dcat.agent"
124+
),
125+
),
126+
("themes", models.ManyToManyField(to="dcat.datatheme")),
127+
(
128+
"license",
129+
models.ForeignKey(
130+
null=True,
131+
on_delete=django.db.models.deletion.SET_NULL,
132+
to="dcat.licencedocument",
133+
),
134+
),
124135
],
125-
bases=("dcat.resource",),
126136
),
127137
migrations.CreateModel(
128-
name="Catalog",
138+
name="Dataset",
129139
fields=[
130140
(
131141
"id",
@@ -139,20 +149,20 @@ class Migration(migrations.Migration):
139149
("title", models.CharField(max_length=255)),
140150
("description", models.TextField()),
141151
(
142-
"publisher",
152+
"catalog",
143153
models.ForeignKey(
144-
on_delete=django.db.models.deletion.CASCADE, to="dcat.agent"
154+
on_delete=django.db.models.deletion.CASCADE, to="dcat.catalog"
145155
),
146156
),
147-
("themes", models.ManyToManyField(to="dcat.datatheme")),
148157
(
149-
"license",
158+
"publisher",
150159
models.ForeignKey(
151160
null=True,
152161
on_delete=django.db.models.deletion.SET_NULL,
153-
to="dcat.licencedocument",
162+
to="dcat.agent",
154163
),
155164
),
165+
("themes", models.ManyToManyField(to="dcat.datatheme")),
156166
],
157167
),
158168
migrations.CreateModel(
@@ -169,11 +179,32 @@ class Migration(migrations.Migration):
169179
),
170180
("title", models.CharField(blank=True, max_length=255)),
171181
("description", models.TextField(blank=True)),
172-
("file", models.FileField(upload_to="files/")),
173-
("external_download_url", models.URLField(blank=True, null=True)),
182+
(
183+
"file",
184+
models.FileField(
185+
upload_to=dcat.models.Distribution._get_storage_path
186+
),
187+
),
188+
("external_download_url", models.URLField(blank=True, default="")),
189+
(
190+
"checksum",
191+
models.OneToOneField(
192+
blank=True,
193+
null=True,
194+
on_delete=django.db.models.deletion.SET_NULL,
195+
to="dcat.checksum",
196+
),
197+
),
198+
(
199+
"dataset",
200+
models.ForeignKey(
201+
on_delete=django.db.models.deletion.CASCADE, to="dcat.dataset"
202+
),
203+
),
174204
(
175205
"license",
176206
models.ForeignKey(
207+
blank=True,
177208
null=True,
178209
on_delete=django.db.models.deletion.SET_NULL,
179210
to="dcat.licencedocument",
@@ -182,36 +213,12 @@ class Migration(migrations.Migration):
182213
(
183214
"format",
184215
models.ForeignKey(
216+
blank=True,
185217
null=True,
186218
on_delete=django.db.models.deletion.SET_NULL,
187219
to="dcat.mediatype",
188220
),
189221
),
190-
(
191-
"dataset",
192-
models.ForeignKey(
193-
on_delete=django.db.models.deletion.CASCADE, to="dcat.dataset"
194-
),
195-
),
196222
],
197223
),
198-
migrations.AddField(
199-
model_name="dataset",
200-
name="catalog",
201-
field=models.ForeignKey(
202-
on_delete=django.db.models.deletion.CASCADE, to="dcat.catalog"
203-
),
204-
),
205-
migrations.AddField(
206-
model_name="dataset",
207-
name="publisher",
208-
field=models.ForeignKey(
209-
null=True, on_delete=django.db.models.deletion.SET_NULL, to="dcat.agent"
210-
),
211-
),
212-
migrations.AddField(
213-
model_name="dataset",
214-
name="themes",
215-
field=models.ManyToManyField(to="dcat.datatheme"),
216-
),
217224
]

‎dcat/migrations/0002_alter_agent_type_alter_distribution_file_and_more.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎dcat/migrations/0003_checksum_distribution_checksum.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎dcat/migrations/0004_alter_distribution_checksum.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)