From 00570a6ac9453a48b06ca094de6e0502c3b73fa5 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 5 Feb 2018 09:03:08 -0500 Subject: Convert dialect modules to relative imports and test For some reason the dialects were not consistently converted to relative imports. Also added a test to ensure that __all__ is functioning within each dialect. Change-Id: I8450ed724473be7e17678e9aba7ba0f661fdf134 --- lib/sqlalchemy/dialects/postgresql/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/sqlalchemy/dialects/postgresql') diff --git a/lib/sqlalchemy/dialects/postgresql/__init__.py b/lib/sqlalchemy/dialects/postgresql/__init__.py index 7e7085807..a985f06a9 100644 --- a/lib/sqlalchemy/dialects/postgresql/__init__.py +++ b/lib/sqlalchemy/dialects/postgresql/__init__.py @@ -6,17 +6,15 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php from . import base, psycopg2, pg8000, pypostgresql, pygresql, \ - zxjdbc, psycopg2cffi - -base.dialect = psycopg2.dialect + zxjdbc, psycopg2cffi # noqa from .base import \ INTEGER, BIGINT, SMALLINT, VARCHAR, CHAR, TEXT, NUMERIC, FLOAT, REAL, \ - INET, CIDR, UUID, BIT, MACADDR, MONEY, OID, DOUBLE_PRECISION, TIMESTAMP, TIME, \ - DATE, BYTEA, BOOLEAN, INTERVAL, ENUM, dialect, TSVECTOR, DropEnumType, \ - CreateEnumType + INET, CIDR, UUID, BIT, MACADDR, MONEY, OID, DOUBLE_PRECISION, \ + TIMESTAMP, TIME, DATE, BYTEA, BOOLEAN, INTERVAL, ENUM, TSVECTOR, \ + DropEnumType, CreateEnumType from .hstore import HSTORE, hstore -from .json import JSON, JSONB +from .json import JSON, JSONB, json from .array import array, ARRAY, Any, All from .ext import aggregate_order_by, ExcludeConstraint, array_agg from .dml import insert, Insert @@ -24,6 +22,9 @@ from .dml import insert, Insert from .ranges import INT4RANGE, INT8RANGE, NUMRANGE, DATERANGE, TSRANGE, \ TSTZRANGE +base.dialect = dialect = psycopg2.dialect + + __all__ = ( 'INTEGER', 'BIGINT', 'SMALLINT', 'VARCHAR', 'CHAR', 'TEXT', 'NUMERIC', 'FLOAT', 'REAL', 'INET', 'CIDR', 'UUID', 'BIT', 'MACADDR', 'MONEY', 'OID', -- cgit v1.2.1