summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2009-04-16 22:25:01 +0000
committerJustin Bronn <jbronn@gmail.com>2009-04-16 22:25:01 +0000
commitff9b9e530c0cd4c62e279da0aed11ed426da59dc (patch)
tree0354414fd4e0c3b4cc29e6f8e8538f5d87e5139d
parent419ed444360cd9b843253f3901a96d41b003251e (diff)
Fixed #9620 -- `GeometryColumns` and `SpatialRefSys` models now play nice with the `AppCache` routines.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/gis/db/backend/oracle/models.py4
-rw-r--r--django/contrib/gis/db/backend/postgis/models.py3
-rw-r--r--django/contrib/gis/db/backend/spatialite/models.py3
3 files changed, 9 insertions, 1 deletions
diff --git a/django/contrib/gis/db/backend/oracle/models.py b/django/contrib/gis/db/backend/oracle/models.py
index 2854b10621..2e0d2f2063 100644
--- a/django/contrib/gis/db/backend/oracle/models.py
+++ b/django/contrib/gis/db/backend/oracle/models.py
@@ -16,7 +16,9 @@ class GeometryColumns(models.Model):
srid = models.IntegerField(primary_key=True)
# TODO: Add support for `diminfo` column (type MDSYS.SDO_DIM_ARRAY).
class Meta:
+ app_label = 'gis'
db_table = 'USER_SDO_GEOM_METADATA'
+ managed = False
@classmethod
def table_name_col(cls):
@@ -49,7 +51,7 @@ class SpatialRefSys(models.Model):
class Meta:
abstract = True
db_table = 'CS_SRS'
- app_label = '_mdsys' # Hack so that syncdb won't try to create "CS_SRS" table.
+ managed = False
@property
def wkt(self):
diff --git a/django/contrib/gis/db/backend/postgis/models.py b/django/contrib/gis/db/backend/postgis/models.py
index de9a1ee1c6..e87ca053eb 100644
--- a/django/contrib/gis/db/backend/postgis/models.py
+++ b/django/contrib/gis/db/backend/postgis/models.py
@@ -17,7 +17,9 @@ class GeometryColumns(models.Model):
type = models.CharField(max_length=30)
class Meta:
+ app_label = 'gis'
db_table = 'geometry_columns'
+ managed = False
@classmethod
def table_name_col(cls):
@@ -54,6 +56,7 @@ class SpatialRefSys(models.Model):
class Meta:
abstract = True
db_table = 'spatial_ref_sys'
+ managed = False
@property
def wkt(self):
diff --git a/django/contrib/gis/db/backend/spatialite/models.py b/django/contrib/gis/db/backend/spatialite/models.py
index e026f5de22..5c5e64f905 100644
--- a/django/contrib/gis/db/backend/spatialite/models.py
+++ b/django/contrib/gis/db/backend/spatialite/models.py
@@ -15,7 +15,9 @@ class GeometryColumns(models.Model):
spatial_index_enabled = models.IntegerField()
class Meta:
+ app_label = 'gis'
db_table = 'geometry_columns'
+ managed = False
@classmethod
def table_name_col(cls):
@@ -56,3 +58,4 @@ class SpatialRefSys(models.Model):
class Meta:
abstract = True
db_table = 'spatial_ref_sys'
+ managed = False