Skip to content

Commit 97b394e

Browse files
mdellwegggainey
authored andcommitted
Revert relative_path migrations
1 parent bed13b0 commit 97b394e

5 files changed

Lines changed: 52 additions & 20 deletions

File tree

CHANGES/+revert_rel_path.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Revert the migration of relative_paths to the new domain type.

pulpcore/app/migrations/0156_alter_contentartifact_relative_path_and_more.py

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,27 @@
11
# Generated by Django 5.2.15 on 2026-08-10 10:26
22

33
import django.contrib.postgres.indexes
4+
import django.contrib.postgres.operations
45
import django.db.models.expressions
56
import pulpcore.app.models.fields
67
from django.db import migrations
78

89

910
class Migration(migrations.Migration):
1011

12+
atomic = False
13+
1114
dependencies = [
1215
('core', '0155_create_rel_path_domains'),
1316
]
1417

1518
operations = [
16-
migrations.AlterField(
17-
model_name='contentartifact',
18-
name='relative_path',
19-
field=pulpcore.app.models.fields.RelativePathField(),
20-
),
2119
migrations.AlterField(
2220
model_name='distribution',
2321
name='base_path',
2422
field=pulpcore.app.models.fields.RelativePathField(),
2523
),
26-
migrations.AlterField(
27-
model_name='publishedartifact',
28-
name='relative_path',
29-
field=pulpcore.app.models.fields.RelativePathField(),
30-
),
31-
migrations.AlterField(
32-
model_name='publishedmetadata',
33-
name='relative_path',
34-
field=pulpcore.app.models.fields.RelativePathField(),
35-
),
36-
migrations.AddIndex(
24+
django.contrib.postgres.operations.AddIndexConcurrently(
3725
model_name='distribution',
3826
index=django.contrib.postgres.indexes.SpGistIndex(django.contrib.postgres.indexes.OpClass("base_path", name='text_ops'), include=('pulp_domain',), name='core_distribution_base_path_text'),
3927
),
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Generated by Django 5.2.15 on 2026-09-04 15:12
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('core', '0158_domain_default_content_guard'),
10+
]
11+
12+
operations = [
13+
migrations.SeparateDatabaseAndState(
14+
database_operations = [
15+
migrations.RunSQL(
16+
# These instructions are idempotent and only effective on the timeline with
17+
# the 3.117.0 migrations properly applied.
18+
sql="""
19+
ALTER TABLE "core_contentartifact" ALTER COLUMN "relative_path" TYPE text;
20+
ALTER TABLE "core_publishedartifact" ALTER COLUMN "relative_path" TYPE text;
21+
ALTER TABLE "core_publishedmetadata" ALTER COLUMN "relative_path" TYPE text;
22+
""",
23+
reverse_sql="",
24+
),
25+
],
26+
state_operations = [
27+
migrations.AlterField(
28+
model_name='contentartifact',
29+
name='relative_path',
30+
field=models.TextField(),
31+
),
32+
migrations.AlterField(
33+
model_name='publishedartifact',
34+
name='relative_path',
35+
field=models.TextField(),
36+
),
37+
migrations.AlterField(
38+
model_name='publishedmetadata',
39+
name='relative_path',
40+
field=models.TextField(),
41+
),
42+
],
43+
)
44+
]

pulpcore/app/models/content.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
from pulpcore.app import pulp_hashlib
2828
from pulpcore.app.models import BaseModel, MasterModel, fields, storage
29-
from pulpcore.app.models.fields import RelativePathField
3029
from pulpcore.app.util import get_domain_pk, gpg_verify
3130
from pulpcore.constants import ALL_KNOWN_CONTENT_CHECKSUMS
3231
from pulpcore.exceptions import (
@@ -658,7 +657,7 @@ class ContentArtifact(BaseModel, QueryMixin):
658657
Artifact, on_delete=models.PROTECT, null=True, related_name="content_memberships"
659658
)
660659
content = models.ForeignKey(Content, on_delete=models.CASCADE)
661-
relative_path = RelativePathField()
660+
relative_path = models.TextField()
662661

663662
objects = BulkCreateManager()
664663

pulpcore/app/models/publication.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class PublishedArtifact(BaseModel):
286286
publication (models.ForeignKey): The publication in which the artifact is included.
287287
"""
288288

289-
relative_path = RelativePathField()
289+
relative_path = models.TextField()
290290

291291
content_artifact = models.ForeignKey("ContentArtifact", on_delete=models.CASCADE)
292292
publication = models.ForeignKey(Publication, on_delete=models.CASCADE)
@@ -309,7 +309,7 @@ class PublishedMetadata(Content):
309309

310310
TYPE = "publishedmetadata"
311311

312-
relative_path = RelativePathField()
312+
relative_path = models.TextField()
313313

314314
publication = models.ForeignKey(Publication, on_delete=models.CASCADE)
315315

0 commit comments

Comments
 (0)