parent
4a412c2e65
commit
9f72b0970d
|
@ -19,17 +19,17 @@ except ImportError as err:
|
||||||
'Did you install mysqlclient?'
|
'Did you install mysqlclient?'
|
||||||
) from err
|
) from err
|
||||||
|
|
||||||
from MySQLdb.constants import CLIENT, FIELD_TYPE # isort:skip
|
from MySQLdb.constants import CLIENT, FIELD_TYPE
|
||||||
from MySQLdb.converters import conversions # isort:skip
|
from MySQLdb.converters import conversions
|
||||||
|
|
||||||
# Some of these import MySQLdb, so import them after checking if it's installed.
|
# Some of these import MySQLdb, so import them after checking if it's installed.
|
||||||
from .client import DatabaseClient # isort:skip
|
from .client import DatabaseClient
|
||||||
from .creation import DatabaseCreation # isort:skip
|
from .creation import DatabaseCreation
|
||||||
from .features import DatabaseFeatures # isort:skip
|
from .features import DatabaseFeatures
|
||||||
from .introspection import DatabaseIntrospection # isort:skip
|
from .introspection import DatabaseIntrospection
|
||||||
from .operations import DatabaseOperations # isort:skip
|
from .operations import DatabaseOperations
|
||||||
from .schema import DatabaseSchemaEditor # isort:skip
|
from .schema import DatabaseSchemaEditor
|
||||||
from .validation import DatabaseValidation # isort:skip
|
from .validation import DatabaseValidation
|
||||||
|
|
||||||
version = Database.version_info
|
version = Database.version_info
|
||||||
if version < (1, 4, 0):
|
if version < (1, 4, 0):
|
||||||
|
|
|
@ -50,14 +50,14 @@ except ImportError as e:
|
||||||
raise ImproperlyConfigured("Error loading cx_Oracle module: %s" % e)
|
raise ImproperlyConfigured("Error loading cx_Oracle module: %s" % e)
|
||||||
|
|
||||||
# Some of these import cx_Oracle, so import them after checking if it's installed.
|
# Some of these import cx_Oracle, so import them after checking if it's installed.
|
||||||
from .client import DatabaseClient # NOQA isort:skip
|
from .client import DatabaseClient # NOQA
|
||||||
from .creation import DatabaseCreation # NOQA isort:skip
|
from .creation import DatabaseCreation # NOQA
|
||||||
from .features import DatabaseFeatures # NOQA isort:skip
|
from .features import DatabaseFeatures # NOQA
|
||||||
from .introspection import DatabaseIntrospection # NOQA isort:skip
|
from .introspection import DatabaseIntrospection # NOQA
|
||||||
from .operations import DatabaseOperations # NOQA isort:skip
|
from .operations import DatabaseOperations # NOQA
|
||||||
from .schema import DatabaseSchemaEditor # NOQA isort:skip
|
from .schema import DatabaseSchemaEditor # NOQA
|
||||||
from .utils import dsn, Oracle_datetime # NOQA isort:skip
|
from .utils import Oracle_datetime, dsn # NOQA
|
||||||
from .validation import DatabaseValidation # NOQA isort:skip
|
from .validation import DatabaseValidation # NOQA
|
||||||
|
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
|
|
|
@ -41,12 +41,12 @@ if PSYCOPG2_VERSION < (2, 5, 4):
|
||||||
|
|
||||||
|
|
||||||
# Some of these import psycopg2, so import them after checking if it's installed.
|
# Some of these import psycopg2, so import them after checking if it's installed.
|
||||||
from .client import DatabaseClient # NOQA isort:skip
|
from .client import DatabaseClient # NOQA
|
||||||
from .creation import DatabaseCreation # NOQA isort:skip
|
from .creation import DatabaseCreation # NOQA
|
||||||
from .features import DatabaseFeatures # NOQA isort:skip
|
from .features import DatabaseFeatures # NOQA
|
||||||
from .introspection import DatabaseIntrospection # NOQA isort:skip
|
from .introspection import DatabaseIntrospection # NOQA
|
||||||
from .operations import DatabaseOperations # NOQA isort:skip
|
from .operations import DatabaseOperations # NOQA
|
||||||
from .schema import DatabaseSchemaEditor # NOQA isort:skip
|
from .schema import DatabaseSchemaEditor # NOQA
|
||||||
|
|
||||||
psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
|
psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
|
||||||
psycopg2.extras.register_uuid()
|
psycopg2.extras.register_uuid()
|
||||||
|
|
|
@ -27,12 +27,12 @@ from django.utils.duration import duration_microseconds
|
||||||
from django.utils.regex_helper import _lazy_re_compile
|
from django.utils.regex_helper import _lazy_re_compile
|
||||||
from django.utils.version import PY38
|
from django.utils.version import PY38
|
||||||
|
|
||||||
from .client import DatabaseClient # isort:skip
|
from .client import DatabaseClient
|
||||||
from .creation import DatabaseCreation # isort:skip
|
from .creation import DatabaseCreation
|
||||||
from .features import DatabaseFeatures # isort:skip
|
from .features import DatabaseFeatures
|
||||||
from .introspection import DatabaseIntrospection # isort:skip
|
from .introspection import DatabaseIntrospection
|
||||||
from .operations import DatabaseOperations # isort:skip
|
from .operations import DatabaseOperations
|
||||||
from .schema import DatabaseSchemaEditor # isort:skip
|
from .schema import DatabaseSchemaEditor
|
||||||
|
|
||||||
|
|
||||||
def decoder(conv_func):
|
def decoder(conv_func):
|
||||||
|
|
Loading…
Reference in New Issue