Commit 6295ea00 authored by Claude Paroz's avatar Claude Paroz
Browse files

Replaced HAS_SPATIAL_DB by testing database feature 

Refs #22632. This should be the base for using more database
features to exclude specific backends in GIS tests.
Thanks Tim Graham for the review.
parent 35695364

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

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ from django.utils import six 
from django.utils.encoding import python_2_unicode_compatible





class BaseSpatialFeatures(object):

    gis_enabled = True





class BaseSpatialOperations(object):

    """

    This module holds the base `BaseSpatialBackend` object, which is

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

+10 −1
Original line number Diff line number Diff line 
from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper

from django.db.backends.mysql.base import (

    DatabaseWrapper as MySQLDatabaseWrapper,

    DatabaseFeatures as MySQLDatabaseFeatures,

)

from django.contrib.gis.db.backends.base import BaseSpatialFeatures

from django.contrib.gis.db.backends.mysql.creation import MySQLCreation

from django.contrib.gis.db.backends.mysql.introspection import MySQLIntrospection

from django.contrib.gis.db.backends.mysql.operations import MySQLOperations





class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures):

    pass





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/oracle/base.py

+10 −1
Original line number Diff line number Diff line 
from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper

from django.db.backends.oracle.base import (

    DatabaseWrapper as OracleDatabaseWrapper,

    DatabaseFeatures as OracleDatabaseFeatures,

)

from django.contrib.gis.db.backends.base import BaseSpatialFeatures

from django.contrib.gis.db.backends.oracle.creation import OracleCreation

from django.contrib.gis.db.backends.oracle.introspection import OracleIntrospection

from django.contrib.gis.db.backends.oracle.operations import OracleOperations





class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures):

    pass





class DatabaseWrapper(OracleDatabaseWrapper):

    def __init__(self, *args, **kwargs):

        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/postgis/base.py

+10 −1
Original line number Diff line number Diff line 
from django.db.backends.creation import NO_DB_ALIAS

from django.db.backends.postgresql_psycopg2.base import DatabaseWrapper as Psycopg2DatabaseWrapper

from django.db.backends.postgresql_psycopg2.base import (

    DatabaseWrapper as Psycopg2DatabaseWrapper,

    DatabaseFeatures as Psycopg2DatabaseFeatures

)

from django.contrib.gis.db.backends.base import BaseSpatialFeatures

from django.contrib.gis.db.backends.postgis.creation import PostGISCreation

from django.contrib.gis.db.backends.postgis.introspection import PostGISIntrospection

from django.contrib.gis.db.backends.postgis.operations import PostGISOperations

from django.contrib.gis.db.backends.postgis.schema import PostGISSchemaEditor





class DatabaseFeatures(BaseSpatialFeatures, Psycopg2DatabaseFeatures):

    pass





class DatabaseWrapper(Psycopg2DatabaseWrapper):

    def __init__(self, *args, **kwargs):

        super(DatabaseWrapper, self).__init__(*args, **kwargs)

        if kwargs.get('alias', '') != NO_DB_ALIAS:

            self.features = DatabaseFeatures(self)

            self.creation = PostGISCreation(self)

            self.ops = PostGISOperations(self)

            self.introspection = PostGISIntrospection(self)

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

+8 −1
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ from django.conf import settings 


from django.core.exceptions import ImproperlyConfigured

from django.db.backends.sqlite3.base import (Database,

    DatabaseWrapper as SQLiteDatabaseWrapper, SQLiteCursorWrapper)

    DatabaseWrapper as SQLiteDatabaseWrapper,

    DatabaseFeatures as SQLiteDatabaseFeatures, SQLiteCursorWrapper)

from django.contrib.gis.db.backends.base import BaseSpatialFeatures

from django.contrib.gis.db.backends.spatialite.client import SpatiaLiteClient

from django.contrib.gis.db.backends.spatialite.creation import SpatiaLiteCreation

from django.contrib.gis.db.backends.spatialite.introspection import SpatiaLiteIntrospection
@@ -13,6 +15,10 @@ from django.contrib.gis.db.backends.spatialite.schema import SpatialiteSchemaEdi 
from django.utils import six





class DatabaseFeatures(BaseSpatialFeatures, SQLiteDatabaseFeatures):

    pass





class DatabaseWrapper(SQLiteDatabaseWrapper):

    def __init__(self, *args, **kwargs):

        # Before we get too far, make sure pysqlite 2.5+ is installed.
@@ -33,6 +39,7 @@ class DatabaseWrapper(SQLiteDatabaseWrapper): 
                                       'SPATIALITE_LIBRARY_PATH in your settings.'

                                       )

        super(DatabaseWrapper, self).__init__(*args, **kwargs)

        self.features = DatabaseFeatures(self)

        self.ops = SpatiaLiteOperations(self)

        self.client = SpatiaLiteClient(self)

        self.creation = SpatiaLiteCreation(self)