mirror of
https://github.com/django/django.git
synced 2024-12-23 09:36:06 +00:00
39d95fb6ad
Several issues resolved here, following from a report that a base_field of GenericIpAddressField was failing. We were using get_prep_value instead of get_db_prep_value in ArrayField which was bypassing any extra modifications to the value being made in the base field's get_db_prep_value. Changing this broke datetime support, so the postgres backend has gained the relevant operation methods to send dates/times/datetimes directly to the db backend instead of casting them to strings. Similarly, a new database feature has been added allowing the uuid to be passed directly to the backend, as we do with timedeltas. On the other side, psycopg2 expects an Inet() instance for IP address fields, so we add a value_to_db_ipaddress method to wrap the strings on postgres. We also have to manually add a database adapter to psycopg2, as we do not wish to use the built in adapter which would turn everything into Inet() instances. Thanks to smclenithan for the report.
65 lines
1.9 KiB
Python
65 lines
1.9 KiB
Python
from django.contrib.postgres.fields import (
|
|
ArrayField, HStoreField, IntegerRangeField, BigIntegerRangeField,
|
|
FloatRangeField, DateTimeRangeField, DateRangeField,
|
|
)
|
|
from django.db import connection, models
|
|
|
|
|
|
class IntegerArrayModel(models.Model):
|
|
field = ArrayField(models.IntegerField())
|
|
|
|
|
|
class NullableIntegerArrayModel(models.Model):
|
|
field = ArrayField(models.IntegerField(), blank=True, null=True)
|
|
|
|
|
|
class CharArrayModel(models.Model):
|
|
field = ArrayField(models.CharField(max_length=10))
|
|
|
|
|
|
class DateTimeArrayModel(models.Model):
|
|
datetimes = ArrayField(models.DateTimeField())
|
|
dates = ArrayField(models.DateField())
|
|
times = ArrayField(models.TimeField())
|
|
|
|
|
|
class NestedIntegerArrayModel(models.Model):
|
|
field = ArrayField(ArrayField(models.IntegerField()))
|
|
|
|
|
|
class OtherTypesArrayModel(models.Model):
|
|
ips = ArrayField(models.GenericIPAddressField())
|
|
uuids = ArrayField(models.UUIDField())
|
|
decimals = ArrayField(models.DecimalField(max_digits=5, decimal_places=2))
|
|
|
|
|
|
class HStoreModel(models.Model):
|
|
field = HStoreField(blank=True, null=True)
|
|
|
|
|
|
class CharFieldModel(models.Model):
|
|
field = models.CharField(max_length=16)
|
|
|
|
|
|
class TextFieldModel(models.Model):
|
|
field = models.TextField()
|
|
|
|
|
|
# Only create this model for databases which support it
|
|
if connection.vendor == 'postgresql' and connection.pg_version >= 90200:
|
|
class RangesModel(models.Model):
|
|
ints = IntegerRangeField(blank=True, null=True)
|
|
bigints = BigIntegerRangeField(blank=True, null=True)
|
|
floats = FloatRangeField(blank=True, null=True)
|
|
timestamps = DateTimeRangeField(blank=True, null=True)
|
|
dates = DateRangeField(blank=True, null=True)
|
|
else:
|
|
# create an object with this name so we don't have failing imports
|
|
class RangesModel(object):
|
|
pass
|
|
|
|
|
|
class ArrayFieldSubclass(ArrayField):
|
|
def __init__(self, *args, **kwargs):
|
|
super(ArrayFieldSubclass, self).__init__(models.IntegerField())
|