Skip to content

Commit 5423519

Browse files
ref: make option values nullable (#94180)
I am planning to convert these to JSONField which represents `None` as database NULL instead of json `null` <!-- Describe your PR here. -->
1 parent 3839951 commit 5423519

File tree

7 files changed

+65
-6
lines changed

7 files changed

+65
-6
lines changed

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ preprod: 0006_add_analysis_file_id_field
2525

2626
replays: 0006_add_bulk_delete_job
2727

28-
sentry: 0933_add_has_agents_insights_flag
28+
sentry: 0934_options_nullable_value
2929

3030
social_auth: 0001_squashed_0002_default_auto_field
3131

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Generated by Django 5.2.1 on 2025-06-24 14:40
2+
3+
from django.db import migrations
4+
5+
import sentry.db.models.fields.picklefield
6+
from sentry.new_migrations.migrations import CheckedMigration
7+
8+
9+
class Migration(CheckedMigration):
10+
# This flag is used to mark that a migration shouldn't be automatically run in production.
11+
# This should only be used for operations where it's safe to run the migration after your
12+
# code has deployed. So this should not be used for most operations that alter the schema
13+
# of a table.
14+
# Here are some things that make sense to mark as post deployment:
15+
# - Large data migrations. Typically we want these to be run manually so that they can be
16+
# monitored and not block the deploy for a long period of time while they run.
17+
# - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
18+
# run this outside deployments so that we don't block them. Note that while adding an index
19+
# is a schema change, it's completely safe to run the operation after the code has deployed.
20+
# Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
21+
22+
is_post_deployment = False
23+
24+
dependencies = [
25+
("sentry", "0933_add_has_agents_insights_flag"),
26+
]
27+
28+
operations = [
29+
migrations.AlterField(
30+
model_name="controloption",
31+
name="value",
32+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
33+
),
34+
migrations.AlterField(
35+
model_name="option",
36+
name="value",
37+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
38+
),
39+
migrations.AlterField(
40+
model_name="organizationoption",
41+
name="value",
42+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
43+
),
44+
migrations.AlterField(
45+
model_name="projectoption",
46+
name="value",
47+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
48+
),
49+
migrations.AlterField(
50+
model_name="projecttemplateoption",
51+
name="value",
52+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
53+
),
54+
migrations.AlterField(
55+
model_name="useroption",
56+
name="value",
57+
field=sentry.db.models.fields.picklefield.PickledObjectField(editable=False, null=True),
58+
),
59+
]

src/sentry/models/options/option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BaseOption(OverwritableConfigMixin, Model):
3636
class Meta:
3737
abstract = True
3838

39-
value = PickledObjectField()
39+
value = PickledObjectField(null=True)
4040

4141
__repr__ = sane_repr("key", "value")
4242

src/sentry/models/options/organization_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class OrganizationOption(Model):
113113

114114
organization = FlexibleForeignKey("sentry.Organization")
115115
key = models.CharField(max_length=64)
116-
value = PickledObjectField()
116+
value = PickledObjectField(null=True)
117117

118118
objects: ClassVar[OrganizationOptionManager] = OrganizationOptionManager()
119119

src/sentry/models/options/project_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class ProjectOption(Model):
181181

182182
project = FlexibleForeignKey("sentry.Project")
183183
key = models.CharField(max_length=64)
184-
value = PickledObjectField()
184+
value = PickledObjectField(null=True)
185185

186186
objects: ClassVar[ProjectOptionManager] = ProjectOptionManager()
187187

src/sentry/models/options/project_template_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class ProjectTemplateOption(Model):
105105

106106
project_template = FlexibleForeignKey("sentry.ProjectTemplate", related_name="options")
107107
key = models.CharField(max_length=64)
108-
value = PickledObjectField()
108+
value = PickledObjectField(null=True)
109109

110110
objects: ClassVar[ProjectTemplateOptionManager] = ProjectTemplateOptionManager()
111111

src/sentry/users/models/user_option.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class UserOption(Model):
209209
project_id = HybridCloudForeignKey("sentry.Project", null=True, on_delete="CASCADE")
210210
organization_id = HybridCloudForeignKey("sentry.Organization", null=True, on_delete="CASCADE")
211211
key = models.CharField(max_length=64)
212-
value = PickledObjectField()
212+
value = PickledObjectField(null=True)
213213

214214
objects: ClassVar[UserOptionManager] = UserOptionManager()
215215

0 commit comments

Comments
 (0)