mirror of
https://github.com/sqlalchemy/sqlalchemy.git
synced 2026-05-12 19:59:09 -04:00
Deprecate the databases packages
The databases package is an old alias to the dialect package, and its usage is now deprecated Change-Id: I5343a2d270ed5a8c654b9fe13dff40cdf54649ed
This commit is contained in:
@@ -16,7 +16,7 @@ from ..dialects.oracle import base as oracle
|
||||
from ..dialects.postgresql import base as postgresql
|
||||
from ..dialects.sqlite import base as sqlite
|
||||
from ..dialects.sybase import base as sybase
|
||||
|
||||
from ..util import warn_deprecated_20
|
||||
|
||||
postgres = postgresql
|
||||
|
||||
@@ -30,3 +30,9 @@ __all__ = (
|
||||
"oracle",
|
||||
"sybase",
|
||||
)
|
||||
|
||||
|
||||
warn_deprecated_20(
|
||||
"The `database` package is deprecated and will be removed in v2.0 "
|
||||
"of sqlalchemy. Use the `dialects` package instead."
|
||||
)
|
||||
|
||||
@@ -158,7 +158,7 @@ def close_open_connections(fn, *args, **kw):
|
||||
|
||||
|
||||
def all_dialects(exclude=None):
|
||||
import sqlalchemy.databases as d
|
||||
import sqlalchemy.dialects as d
|
||||
|
||||
for name in d.__all__:
|
||||
# TEMPORARY
|
||||
@@ -167,7 +167,7 @@ def all_dialects(exclude=None):
|
||||
mod = getattr(d, name, None)
|
||||
if not mod:
|
||||
mod = getattr(
|
||||
__import__("sqlalchemy.databases.%s" % name).databases, name
|
||||
__import__("sqlalchemy.dialects.%s" % name).databases, name
|
||||
)
|
||||
yield mod.dialect()
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ from sqlalchemy import String
|
||||
from sqlalchemy import Table
|
||||
from sqlalchemy import testing
|
||||
from sqlalchemy import util
|
||||
from sqlalchemy.databases import mssql
|
||||
from sqlalchemy.dialects.mssql import base as mssql
|
||||
from sqlalchemy.sql import column
|
||||
from sqlalchemy.sql import table
|
||||
from sqlalchemy.testing import AssertsCompiledSQL
|
||||
|
||||
@@ -13,7 +13,7 @@ from sqlalchemy import Table
|
||||
from sqlalchemy import testing
|
||||
from sqlalchemy import types
|
||||
from sqlalchemy import util
|
||||
from sqlalchemy.databases import mssql
|
||||
from sqlalchemy.dialects import mssql
|
||||
from sqlalchemy.dialects.mssql import base
|
||||
from sqlalchemy.dialects.mssql.information_schema import CoerceUnicode
|
||||
from sqlalchemy.dialects.mssql.information_schema import tables
|
||||
|
||||
@@ -32,7 +32,7 @@ from sqlalchemy import types
|
||||
from sqlalchemy import Unicode
|
||||
from sqlalchemy import UnicodeText
|
||||
from sqlalchemy import util
|
||||
from sqlalchemy.databases import mssql
|
||||
from sqlalchemy.dialects.mssql import base as mssql
|
||||
from sqlalchemy.dialects.mssql import ROWVERSION
|
||||
from sqlalchemy.dialects.mssql import TIMESTAMP
|
||||
from sqlalchemy.dialects.mssql.base import _MSDate
|
||||
|
||||
@@ -397,10 +397,10 @@ class DomainReflectionTest(fixtures.TestBase, AssertsExecutionResults):
|
||||
), "Expected reflected column to be nullable."
|
||||
|
||||
def test_unknown_types(self):
|
||||
from sqlalchemy.databases import postgresql
|
||||
from sqlalchemy.dialects.postgresql import base
|
||||
|
||||
ischema_names = postgresql.PGDialect.ischema_names
|
||||
postgresql.PGDialect.ischema_names = {}
|
||||
ischema_names = base.PGDialect.ischema_names
|
||||
base.PGDialect.ischema_names = {}
|
||||
try:
|
||||
m2 = MetaData(testing.db)
|
||||
assert_raises(exc.SAWarning, Table, "testtable", m2, autoload=True)
|
||||
@@ -412,7 +412,7 @@ class DomainReflectionTest(fixtures.TestBase, AssertsExecutionResults):
|
||||
assert t3.c.answer.type.__class__ == sa.types.NullType
|
||||
|
||||
finally:
|
||||
postgresql.PGDialect.ischema_names = ischema_names
|
||||
base.PGDialect.ischema_names = ischema_names
|
||||
|
||||
|
||||
class ReflectionTest(fixtures.TestBase):
|
||||
|
||||
@@ -17,7 +17,7 @@ from sqlalchemy import types as sqltypes
|
||||
from sqlalchemy import Unicode
|
||||
from sqlalchemy import update
|
||||
from sqlalchemy import VARCHAR
|
||||
from sqlalchemy.databases import firebird
|
||||
from sqlalchemy.dialects.firebird import base as firebird
|
||||
from sqlalchemy.exc import ProgrammingError
|
||||
from sqlalchemy.sql import column
|
||||
from sqlalchemy.sql import table
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from sqlalchemy import extract
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy import sql
|
||||
from sqlalchemy.databases import sybase
|
||||
from sqlalchemy.dialects import sybase
|
||||
from sqlalchemy.testing import assert_raises_message
|
||||
from sqlalchemy.testing import AssertsCompiledSQL
|
||||
from sqlalchemy.testing import fixtures
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
from sqlalchemy.testing import expect_deprecated_20, fixtures
|
||||
from sqlalchemy.util.compat import import_
|
||||
|
||||
|
||||
class DeprecationWarningsTest(fixtures.TestBase):
|
||||
__backend__ = False
|
||||
|
||||
def test_deprecate_databases(self):
|
||||
with expect_deprecated_20(
|
||||
"The `database` package is deprecated and will be removed in v2.0 "
|
||||
):
|
||||
import_('sqlalchemy.databases')
|
||||
Reference in New Issue
Block a user