Skip to content

Commit a8b33cd

Browse files
Ken LippoldKen Lippold
Ken Lippold
authored and
Ken Lippold
committed
Squash migrations
1 parent 4156e70 commit a8b33cd

9 files changed

+263
-440
lines changed

‎etl/migrations/0001_initial.py‎

Lines changed: 24 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,19 @@
1-
# Generated by Django 5.2b1 on 2025-04-10 16:24
1+
# Generated by Django 5.2b1 on 2025-04-15 21:58
22

3-
import django.db.models.deletion
43
import iam.models.utils
5-
import uuid
4+
import uuid6
65
from django.db import migrations, models
76

87

98
class Migration(migrations.Migration):
109

1110
initial = True
1211

13-
dependencies = [
14-
("iam", "0001_initial"),
15-
]
12+
dependencies = []
1613

1714
operations = [
1815
migrations.CreateModel(
19-
name="OrchestrationSystem",
20-
fields=[
21-
(
22-
"id",
23-
models.UUIDField(
24-
default=uuid.uuid4,
25-
editable=False,
26-
primary_key=True,
27-
serialize=False,
28-
),
29-
),
30-
("name", models.CharField(max_length=255)),
31-
("orchestration_system_type", models.CharField(max_length=255)),
32-
(
33-
"workspace",
34-
models.ForeignKey(
35-
blank=True,
36-
null=True,
37-
on_delete=django.db.models.deletion.DO_NOTHING,
38-
related_name="orchestration_systems",
39-
to="iam.workspace",
40-
),
41-
),
42-
],
43-
bases=(models.Model, iam.models.utils.PermissionChecker),
44-
),
45-
migrations.CreateModel(
46-
name="DataSource",
16+
name="DataArchive",
4717
fields=[
4818
("interval", models.PositiveIntegerField(blank=True, null=True)),
4919
(
@@ -61,38 +31,22 @@ class Migration(migrations.Migration):
6131
(
6232
"id",
6333
models.UUIDField(
64-
default=uuid.uuid4,
34+
default=uuid6.uuid7,
6535
editable=False,
6636
primary_key=True,
6737
serialize=False,
6838
),
6939
),
7040
("name", models.CharField(max_length=255)),
7141
("settings", models.JSONField(blank=True, null=True)),
72-
(
73-
"workspace",
74-
models.ForeignKey(
75-
on_delete=django.db.models.deletion.DO_NOTHING,
76-
related_name="data_sources",
77-
to="iam.workspace",
78-
),
79-
),
80-
(
81-
"orchestration_system",
82-
models.ForeignKey(
83-
on_delete=django.db.models.deletion.DO_NOTHING,
84-
related_name="data_sources",
85-
to="etl.orchestrationsystem",
86-
),
87-
),
8842
],
8943
options={
9044
"abstract": False,
9145
},
9246
bases=(models.Model, iam.models.utils.PermissionChecker),
9347
),
9448
migrations.CreateModel(
95-
name="DataArchive",
49+
name="DataSource",
9650
fields=[
9751
("interval", models.PositiveIntegerField(blank=True, null=True)),
9852
(
@@ -110,34 +64,35 @@ class Migration(migrations.Migration):
11064
(
11165
"id",
11266
models.UUIDField(
113-
default=uuid.uuid4,
67+
default=uuid6.uuid7,
11468
editable=False,
11569
primary_key=True,
11670
serialize=False,
11771
),
11872
),
11973
("name", models.CharField(max_length=255)),
12074
("settings", models.JSONField(blank=True, null=True)),
121-
(
122-
"workspace",
123-
models.ForeignKey(
124-
on_delete=django.db.models.deletion.DO_NOTHING,
125-
related_name="data_archives",
126-
to="iam.workspace",
127-
),
128-
),
129-
(
130-
"orchestration_system",
131-
models.ForeignKey(
132-
on_delete=django.db.models.deletion.DO_NOTHING,
133-
related_name="data_archives",
134-
to="etl.orchestrationsystem",
135-
),
136-
),
13775
],
13876
options={
13977
"abstract": False,
14078
},
14179
bases=(models.Model, iam.models.utils.PermissionChecker),
14280
),
81+
migrations.CreateModel(
82+
name="OrchestrationSystem",
83+
fields=[
84+
(
85+
"id",
86+
models.UUIDField(
87+
default=uuid6.uuid7,
88+
editable=False,
89+
primary_key=True,
90+
serialize=False,
91+
),
92+
),
93+
("name", models.CharField(max_length=255)),
94+
("orchestration_system_type", models.CharField(max_length=255)),
95+
],
96+
bases=(models.Model, iam.models.utils.PermissionChecker),
97+
),
14398
]

‎etl/migrations/0002_alter_dataarchive_id_alter_datasource_id_and_more.py‎

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

‎etl/migrations/0002_initial.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Generated by Django 5.2b1 on 2025-04-15 21:58
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
initial = True
10+
11+
dependencies = [
12+
("etl", "0001_initial"),
13+
("iam", "0001_initial"),
14+
]
15+
16+
operations = [
17+
migrations.AddField(
18+
model_name="dataarchive",
19+
name="workspace",
20+
field=models.ForeignKey(
21+
on_delete=django.db.models.deletion.DO_NOTHING,
22+
related_name="data_archives",
23+
to="iam.workspace",
24+
),
25+
),
26+
migrations.AddField(
27+
model_name="datasource",
28+
name="workspace",
29+
field=models.ForeignKey(
30+
on_delete=django.db.models.deletion.DO_NOTHING,
31+
related_name="data_sources",
32+
to="iam.workspace",
33+
),
34+
),
35+
migrations.AddField(
36+
model_name="orchestrationsystem",
37+
name="workspace",
38+
field=models.ForeignKey(
39+
blank=True,
40+
null=True,
41+
on_delete=django.db.models.deletion.DO_NOTHING,
42+
related_name="orchestration_systems",
43+
to="iam.workspace",
44+
),
45+
),
46+
migrations.AddField(
47+
model_name="datasource",
48+
name="orchestration_system",
49+
field=models.ForeignKey(
50+
on_delete=django.db.models.deletion.DO_NOTHING,
51+
related_name="data_sources",
52+
to="etl.orchestrationsystem",
53+
),
54+
),
55+
migrations.AddField(
56+
model_name="dataarchive",
57+
name="orchestration_system",
58+
field=models.ForeignKey(
59+
on_delete=django.db.models.deletion.DO_NOTHING,
60+
related_name="data_archives",
61+
to="etl.orchestrationsystem",
62+
),
63+
),
64+
]

‎iam/migrations/0001_initial.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Generated by Django 5.2b1 on 2025-03-01 00:11
1+
# Generated by Django 5.2b1 on 2025-04-15 21:58
22

33
import django.contrib.auth.validators
44
import django.db.models.deletion
55
import django.utils.timezone
66
import iam.models.utils
7-
import uuid
7+
import uuid6
88
from django.conf import settings
99
from django.db import migrations, models
1010

@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
5959
(
6060
"id",
6161
models.UUIDField(
62-
default=uuid.uuid4,
62+
default=uuid6.uuid7,
6363
editable=False,
6464
primary_key=True,
6565
serialize=False,
@@ -271,7 +271,7 @@ class Migration(migrations.Migration):
271271
(
272272
"id",
273273
models.UUIDField(
274-
default=uuid.uuid4,
274+
default=uuid6.uuid7,
275275
editable=False,
276276
primary_key=True,
277277
serialize=False,

‎iam/migrations/0002_alter_role_id_alter_workspace_id.py‎

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

0 commit comments

Comments
 (0)