Commit 3a18002b authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #8210 and #8664: moved `USStateField` and `PhoneNumberField` to... 

Fixed #8210 and #8664: moved `USStateField` and `PhoneNumberField` to `django.contrib.localflavor.us`. This is a backwards-incompatible change, albeit a minor one; just add an aditional `import` and go on your way.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 4f225d44

django/contrib/gis/tests/relatedapp/models.py

+2 −1
Original line number Diff line number Diff line 
from django.contrib.gis.db import models

from django.contrib.localflavor.us.models import USStateField



class Location(models.Model):

    name = models.CharField(max_length=50)
@@ -7,6 +8,6 @@ class Location(models.Model): 


class City(models.Model):

    name = models.CharField(max_length=50)

    state = models.USStateField()

    state = USStateField()

    location = models.ForeignKey(Location)

    objects = models.GeoManager()

django/contrib/gis/utils/layermapping.py

+2 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ from django.contrib.gis.gdal.field import \ 
    OFTDate, OFTDateTime, OFTInteger, OFTReal, OFTString, OFTTime

from django.contrib.gis.models import GeometryColumns, SpatialRefSys

from django.db import models, transaction

from django.contrib.localflavor.us.models import USStateField



# LayerMapping exceptions.

class LayerMapError(Exception): pass
@@ -150,7 +151,7 @@ class LayerMapping(object): 
        models.SlugField : OFTString,

        models.TextField : OFTString,

        models.URLField : OFTString,

        models.USStateField : OFTString,

        USStateField : OFTString,

        models.XMLField : OFTString,

        models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),

        models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),

django/contrib/localflavor/us/models.py

0 → 100644
+35 −0
Original line number Diff line number Diff line 
from django.conf import settings

from django.db.models.fields import Field



class USStateField(Field): 

    def get_internal_type(self): 

        return "USStateField" 

        

    def db_type(self):

        if settings.DATABASE_ENGINE == 'oracle':

            return 'CHAR(2)'

        else:

            return 'varchar(2)'

    

    def formfield(self, **kwargs): 

        from django.contrib.localflavor.us.forms import USStateSelect 

        defaults = {'widget': USStateSelect} 

        defaults.update(kwargs) 

        return super(USStateField, self).formfield(**defaults)



class PhoneNumberField(Field):

    def get_internal_type(self):

        return "PhoneNumberField"



    def db_type(self):

        if settings.DATABASE_ENGINE == 'oracle':

            return 'VARCHAR2(20)'

        else:

            return 'varchar(20)'



    def formfield(self, **kwargs):

        from django.contrib.localflavor.us.forms import USPhoneNumberField

        defaults = {'form_class': USPhoneNumberField}

        defaults.update(kwargs)

        return super(PhoneNumberField, self).formfield(**defaults)

django/db/backends/mysql/creation.py

+0 −2
Original line number Diff line number Diff line
@@ -21,14 +21,12 @@ class DatabaseCreation(BaseDatabaseCreation): 
        'IPAddressField':    'char(15)',

        'NullBooleanField':  'bool',

        'OneToOneField':     'integer',

        'PhoneNumberField':  'varchar(20)',

        'PositiveIntegerField': 'integer UNSIGNED',

        'PositiveSmallIntegerField': 'smallint UNSIGNED',

        'SlugField':         'varchar(%(max_length)s)',

        'SmallIntegerField': 'smallint',

        'TextField':         'longtext',

        'TimeField':         'time',

        'USStateField':      'varchar(2)',

    }



    def sql_table_creation_suffix(self):

django/db/backends/oracle/creation.py

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ class DatabaseCreation(BaseDatabaseCreation): 
        'IPAddressField':               'VARCHAR2(15)',

        'NullBooleanField':             'NUMBER(1) CHECK ((%(qn_column)s IN (0,1)) OR (%(qn_column)s IS NULL))',

        'OneToOneField':                'NUMBER(11)',

        'PhoneNumberField':             'VARCHAR2(20)',

        'PositiveIntegerField':         'NUMBER(11) CHECK (%(qn_column)s >= 0)',

        'PositiveSmallIntegerField':    'NUMBER(11) CHECK (%(qn_column)s >= 0)',

        'SlugField':                    'NVARCHAR2(50)',
@@ -38,7 +37,6 @@ class DatabaseCreation(BaseDatabaseCreation): 
        'TextField':                    'NCLOB',

        'TimeField':                    'TIMESTAMP',

        'URLField':                     'VARCHAR2(%(max_length)s)',

        'USStateField':                 'CHAR(2)',

    }



    remember = {}