mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Used migration framework in GIS test tearDown

Browse Source
This commit is contained in:
Claude Paroz
2014-04-22 22:49:52 +02:00
parent 3c06b2f2a3
commit 48c4ea4146
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/gis/db/backends/postgis/schema.py
View File

@@ -10,6 +10,7 @@ class PostGISSchemaEditor(DatabaseSchemaEditor):
sql_drop_geometry_column = "SELECT DropGeometryColumn(%(table)s, %(column)s)" sql_drop_geometry_column = "SELECT DropGeometryColumn(%(table)s, %(column)s)"
sql_alter_geometry_column_not_null = "ALTER TABLE %(table)s ALTER COLUMN %(column)s SET NOT NULL" sql_alter_geometry_column_not_null = "ALTER TABLE %(table)s ALTER COLUMN %(column)s SET NOT NULL"
sql_add_spatial_index = "CREATE INDEX %(index)s ON %(table)s USING %(index_type)s (%(column)s %(ops)s)" sql_add_spatial_index = "CREATE INDEX %(index)s ON %(table)s USING %(index_type)s (%(column)s %(ops)s)"
sql_clear_geometry_columns = "DELETE FROM geometry_columns WHERE f_table_name = %(table)s"
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(PostGISSchemaEditor, self).__init__(*args, **kwargs) super(PostGISSchemaEditor, self).__init__(*args, **kwargs)
@@ -46,7 +47,7 @@ class PostGISSchemaEditor(DatabaseSchemaEditor):
self.sql_alter_geometry_column_not_null % { self.sql_alter_geometry_column_not_null % {
"table": self.quote_name(model._meta.db_table), "table": self.quote_name(model._meta.db_table),
"column": self.quote_name(field.column), "column": self.quote_name(field.column),
}, }
) )
if field.spatial_index: if field.spatial_index:
@@ -83,6 +84,12 @@ class PostGISSchemaEditor(DatabaseSchemaEditor):
self.execute(sql) self.execute(sql)
self.geometry_sql = [] self.geometry_sql = []
def delete_model(self, model):
super(PostGISSchemaEditor, self).delete_model(model)
self.execute(self.sql_clear_geometry_columns % {
"table": self.geo_quote_name(model._meta.db_table),
})
def add_field(self, model, field): def add_field(self, model, field):
super(PostGISSchemaEditor, self).add_field(model, field) super(PostGISSchemaEditor, self).add_field(model, field)
# Create geometry columns # Create geometry columns

13
django/contrib/gis/tests/gis_migrations/test_operations.py
View File

@@ -6,7 +6,6 @@ from django.contrib.gis.tests.utils import HAS_SPATIAL_DB
from django.db import connection, migrations, models from django.db import connection, migrations, models
from django.db.migrations.migration import Migration from django.db.migrations.migration import Migration
from django.db.migrations.state import ProjectState from django.db.migrations.state import ProjectState
from django.db.utils import DatabaseError
from django.test import TransactionTestCase from django.test import TransactionTestCase
if HAS_SPATIAL_DB: if HAS_SPATIAL_DB:
@@ -24,15 +23,7 @@ class OperationTests(TransactionTestCase):
def tearDown(self): def tearDown(self):
# Delete table after testing # Delete table after testing
with connection.cursor() as cursor: self.apply_operations('gis', self.current_state, [migrations.DeleteModel("Neighborhood")])
try:
cursor.execute("DROP TABLE %s" % connection.ops.quote_name("gis_neighborhood"))
except DatabaseError:
pass
else:
if HAS_GEOMETRY_COLUMNS:
cursor.execute("DELETE FROM geometry_columns WHERE %s = %%s" % (
GeometryColumns.table_name_col(),), ["gis_neighborhood"])
super(OperationTests, self).tearDown() super(OperationTests, self).tearDown()
def get_table_description(self, table): def get_table_description(self, table):
@@ -84,6 +75,7 @@ class OperationTests(TransactionTestCase):
GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(), GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(),
2 2
) )
self.current_state = new_state
def test_remove_gis_field(self): def test_remove_gis_field(self):
""" """
@@ -103,3 +95,4 @@ class OperationTests(TransactionTestCase):
GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(), GeometryColumns.objects.filter(**{GeometryColumns.table_name_col(): "gis_neighborhood"}).count(),
0 0
) )
self.current_state = new_state