Skip to content

Commit 6675258

Browse files
committed
Remove encrypted model base
1 parent 0d0b246 commit 6675258

File tree

1 file changed

+19
-30
lines changed

1 file changed

+19
-30
lines changed

tests/encryption_/models.py

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,90 +46,79 @@ class Billing(EmbeddedModel):
4646
cc_number = models.CharField(max_length=20)
4747

4848

49-
class EncryptedModelBase(models.Model):
50-
"""
51-
Abstract base model for all Encrypted models
52-
that require the 'supports_queryable_encryption' DB feature.
53-
"""
54-
55-
class Meta:
56-
abstract = True
57-
required_db_features = {"supports_queryable_encryption"}
58-
59-
6049
# Equality-queryable fields
61-
class EncryptedBinaryTest(EncryptedModelBase):
50+
class EncryptedBinaryTest(models.Model):
6251
value = EncryptedBinaryField(queries={"queryType": "equality"})
6352

6453

65-
class EncryptedBooleanTest(EncryptedModelBase):
54+
class EncryptedBooleanTest(models.Model):
6655
value = EncryptedBooleanField(queries={"queryType": "equality"})
6756

6857

69-
class EncryptedCharTest(EncryptedModelBase):
58+
class EncryptedCharTest(models.Model):
7059
value = EncryptedCharField(max_length=255, queries={"queryType": "equality"})
7160

7261

73-
class EncryptedEmailTest(EncryptedModelBase):
62+
class EncryptedEmailTest(models.Model):
7463
value = EncryptedEmailField(max_length=255, queries={"queryType": "equality"})
7564

7665

77-
class EncryptedGenericIPAddressTest(EncryptedModelBase):
66+
class EncryptedGenericIPAddressTest(models.Model):
7867
value = EncryptedGenericIPAddressField(queries={"queryType": "equality"})
7968

8069

81-
class EncryptedTextTest(EncryptedModelBase):
70+
class EncryptedTextTest(models.Model):
8271
value = EncryptedTextField(queries={"queryType": "equality"})
8372

8473

85-
class EncryptedURLTest(EncryptedModelBase):
74+
class EncryptedURLTest(models.Model):
8675
value = EncryptedURLField(max_length=500, queries={"queryType": "equality"})
8776

8877

8978
# Range-queryable fields (also support equality)
90-
class EncryptedBigIntegerTest(EncryptedModelBase):
79+
class EncryptedBigIntegerTest(models.Model):
9180
value = EncryptedBigIntegerField(queries={"queryType": "range"})
9281

9382

94-
class EncryptedDateTest(EncryptedModelBase):
83+
class EncryptedDateTest(models.Model):
9584
value = EncryptedDateField(queries={"queryType": "range"})
9685

9786

98-
class EncryptedDateTimeTest(EncryptedModelBase):
87+
class EncryptedDateTimeTest(models.Model):
9988
value = EncryptedDateTimeField(queries={"queryType": "range"})
10089

10190

102-
class EncryptedDecimalTest(EncryptedModelBase):
91+
class EncryptedDecimalTest(models.Model):
10392
value = EncryptedDecimalField(max_digits=10, decimal_places=2, queries={"queryType": "range"})
10493

10594

106-
class EncryptedDurationTest(EncryptedModelBase):
95+
class EncryptedDurationTest(models.Model):
10796
value = EncryptedDurationField(queries={"queryType": "range"})
10897

10998

110-
class EncryptedFloatTest(EncryptedModelBase):
99+
class EncryptedFloatTest(models.Model):
111100
value = EncryptedFloatField(queries={"queryType": "range"})
112101

113102

114-
class EncryptedIntegerTest(EncryptedModelBase):
103+
class EncryptedIntegerTest(models.Model):
115104
value = EncryptedIntegerField(queries={"queryType": "range"})
116105

117106

118-
class EncryptedPositiveBigIntegerTest(EncryptedModelBase):
107+
class EncryptedPositiveBigIntegerTest(models.Model):
119108
value = EncryptedPositiveBigIntegerField(queries={"queryType": "range"})
120109

121110

122-
class EncryptedPositiveIntegerTest(EncryptedModelBase):
111+
class EncryptedPositiveIntegerTest(models.Model):
123112
value = EncryptedPositiveIntegerField(queries={"queryType": "range"})
124113

125114

126-
class EncryptedPositiveSmallIntegerTest(EncryptedModelBase):
115+
class EncryptedPositiveSmallIntegerTest(models.Model):
127116
value = EncryptedPositiveSmallIntegerField(queries={"queryType": "range"})
128117

129118

130-
class EncryptedSmallIntegerTest(EncryptedModelBase):
119+
class EncryptedSmallIntegerTest(models.Model):
131120
value = EncryptedSmallIntegerField(queries={"queryType": "range"})
132121

133122

134-
class EncryptedTimeTest(EncryptedModelBase):
123+
class EncryptedTimeTest(models.Model):
135124
value = EncryptedTimeField(queries={"queryType": "range"})

0 commit comments

Comments
 (0)