Removed obsolete SQL generation methods. (2b039d96) · Commits · Dom Sekotill / django

django/contrib/gis/db/backends/mysql/base.py

+0 −2

Original line number	Diff line number	Diff line
		from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper

		from .creation import MySQLCreation
		from .features import DatabaseFeatures
		from .introspection import MySQLIntrospection
		from .operations import MySQLOperations
		@@ -13,6 +12,5 @@ class DatabaseWrapper(MySQLDatabaseWrapper):
		def __init__(self, args, *kwargs):
		super(DatabaseWrapper, self).__init__(args, *kwargs)
		self.features = DatabaseFeatures(self)
		self.creation = MySQLCreation(self)
		self.ops = MySQLOperations(self)
		self.introspection = MySQLIntrospection(self)

django/contrib/gis/db/backends/mysql/creation.py

deleted100644 → 0

+0 −18

Original line number	Diff line number	Diff line
		from django.db.backends.mysql.creation import DatabaseCreation


		class MySQLCreation(DatabaseCreation):
		def sql_indexes_for_field(self, model, f, style):
		from django.contrib.gis.db.models.fields import GeometryField
		output = super(MySQLCreation, self).sql_indexes_for_field(model, f, style)

		if isinstance(f, GeometryField) and f.spatial_index:
		qn = self.connection.ops.quote_name
		db_table = model._meta.db_table
		idx_name = '%s_%s_id' % (db_table, f.column)
		output.append(style.SQL_KEYWORD('CREATE SPATIAL INDEX ') +
		style.SQL_TABLE(qn(idx_name)) +
		style.SQL_KEYWORD(' ON ') +
		style.SQL_TABLE(qn(db_table)) + '(' +
		style.SQL_FIELD(qn(f.column)) + ');')
		return output

django/contrib/gis/db/backends/oracle/base.py

+0 −2

Original line number	Diff line number	Diff line
		from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper

		from .creation import OracleCreation
		from .features import DatabaseFeatures
		from .introspection import OracleIntrospection
		from .operations import OracleOperations
		@@ -14,5 +13,4 @@ class DatabaseWrapper(OracleDatabaseWrapper):
		super(DatabaseWrapper, self).__init__(args, *kwargs)
		self.features = DatabaseFeatures(self)
		self.ops = OracleOperations(self)
		self.creation = OracleCreation(self)
		self.introspection = OracleIntrospection(self)

django/contrib/gis/db/backends/oracle/creation.py

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		from django.db.backends.oracle.creation import DatabaseCreation
		from django.db.backends.utils import truncate_name


		class OracleCreation(DatabaseCreation):

		def sql_indexes_for_field(self, model, f, style):
		"Return any spatial index creation SQL for the field."
		from django.contrib.gis.db.models.fields import GeometryField

		output = super(OracleCreation, self).sql_indexes_for_field(model, f, style)

		if isinstance(f, GeometryField):
		gqn = self.connection.ops.geo_quote_name
		qn = self.connection.ops.quote_name
		db_table = model._meta.db_table

		output.append(style.SQL_KEYWORD('INSERT INTO ') +
		style.SQL_TABLE('USER_SDO_GEOM_METADATA') +
		' (%s, %s, %s, %s)\n ' % tuple(map(qn, ['TABLE_NAME', 'COLUMN_NAME', 'DIMINFO', 'SRID'])) +
		style.SQL_KEYWORD(' VALUES ') + '(\n ' +
		style.SQL_TABLE(gqn(db_table)) + ',\n ' +
		style.SQL_FIELD(gqn(f.column)) + ',\n ' +
		style.SQL_KEYWORD("MDSYS.SDO_DIM_ARRAY") + '(\n ' +
		style.SQL_KEYWORD("MDSYS.SDO_DIM_ELEMENT") +
		("('LONG', %s, %s, %s),\n " % (f._extent[0], f._extent[2], f._tolerance)) +
		style.SQL_KEYWORD("MDSYS.SDO_DIM_ELEMENT") +
		("('LAT', %s, %s, %s)\n ),\n" % (f._extent[1], f._extent[3], f._tolerance)) +
		' %s\n );' % f.srid)

		if f.spatial_index:
		# Getting the index name, Oracle doesn't allow object
		# names > 30 characters.
		idx_name = truncate_name('%s_%s_id' % (db_table, f.column), 30)

		output.append(style.SQL_KEYWORD('CREATE INDEX ') +
		style.SQL_TABLE(qn(idx_name)) +
		style.SQL_KEYWORD(' ON ') +
		style.SQL_TABLE(qn(db_table)) + '(' +
		style.SQL_FIELD(qn(f.column)) + ') ' +
		style.SQL_KEYWORD('INDEXTYPE IS ') +
		style.SQL_TABLE('MDSYS.SPATIAL_INDEX') + ';')
		return output

django/contrib/gis/db/backends/postgis/creation.py

+0 −62

Original line number	Diff line number	Diff line
		@@ -2,68 +2,6 @@ from django.db.backends.postgresql_psycopg2.creation import DatabaseCreation


		class PostGISCreation(DatabaseCreation):
		geom_index_type = 'GIST'
		geom_index_ops = 'GIST_GEOMETRY_OPS'
		geom_index_ops_nd = 'GIST_GEOMETRY_OPS_ND'

		def sql_indexes_for_field(self, model, f, style):
		"Return any spatial index creation SQL for the field."
		from django.contrib.gis.db.models.fields import GeometryField

		output = super(PostGISCreation, self).sql_indexes_for_field(model, f, style)

		if isinstance(f, GeometryField):
		gqn = self.connection.ops.geo_quote_name
		qn = self.connection.ops.quote_name
		db_table = model._meta.db_table

		if f.geography or self.connection.ops.geometry:
		# Geography and Geometry (PostGIS 2.0+) columns are
		# created normally.
		pass
		else:
		# Geometry columns are created by `AddGeometryColumn`
		# stored procedure.
		output.append(style.SQL_KEYWORD('SELECT ') +
		style.SQL_TABLE('AddGeometryColumn') + '(' +
		style.SQL_TABLE(gqn(db_table)) + ', ' +
		style.SQL_FIELD(gqn(f.column)) + ', ' +
		style.SQL_FIELD(str(f.srid)) + ', ' +
		style.SQL_COLTYPE(gqn(f.geom_type)) + ', ' +
		style.SQL_KEYWORD(str(f.dim)) + ');')

		if not f.null:
		# Add a NOT NULL constraint to the field
		output.append(style.SQL_KEYWORD('ALTER TABLE ') +
		style.SQL_TABLE(qn(db_table)) +
		style.SQL_KEYWORD(' ALTER ') +
		style.SQL_FIELD(qn(f.column)) +
		style.SQL_KEYWORD(' SET NOT NULL') + ';')

		if f.spatial_index:
		# Spatial indexes created the same way for both Geometry and
		# Geography columns.
		# PostGIS 2.0 does not support GIST_GEOMETRY_OPS. So, on 1.5
		# we use GIST_GEOMETRY_OPS, on 2.0 we use either "nd" ops
		# which are fast on multidimensional cases, or just plain
		# gist index for the 2d case.
		if f.geography:
		index_ops = ''
		elif self.connection.ops.geometry:
		if f.dim > 2:
		index_ops = ' ' + style.SQL_KEYWORD(self.geom_index_ops_nd)
		else:
		index_ops = ''
		else:
		index_ops = ' ' + style.SQL_KEYWORD(self.geom_index_ops)
		output.append(style.SQL_KEYWORD('CREATE INDEX ') +
		style.SQL_TABLE(qn('%s_%s_id' % (db_table, f.column))) +
		style.SQL_KEYWORD(' ON ') +
		style.SQL_TABLE(qn(db_table)) +
		style.SQL_KEYWORD(' USING ') +
		style.SQL_COLTYPE(self.geom_index_type) + ' ( ' +
		style.SQL_FIELD(qn(f.column)) + index_ops + ' );')
		return output

		def sql_table_creation_suffix(self):
		if self.connection.template_postgis is not None: