summaryrefslogtreecommitdiff
path: root/test/dialect/postgresql
diff options
context:
space:
mode:
Diffstat (limited to 'test/dialect/postgresql')
-rw-r--r--test/dialect/postgresql/test_query.py1
-rw-r--r--test/dialect/postgresql/test_types.py13
2 files changed, 9 insertions, 5 deletions
diff --git a/test/dialect/postgresql/test_query.py b/test/dialect/postgresql/test_query.py
index 9f92a7830..c031e43de 100644
--- a/test/dialect/postgresql/test_query.py
+++ b/test/dialect/postgresql/test_query.py
@@ -761,6 +761,7 @@ class MatchTest(fixtures.TestBase, AssertsCompiledSQL):
@testing.fails_on('postgresql+psycopg2', 'uses pyformat')
@testing.fails_on('postgresql+pypostgresql', 'uses pyformat')
+ @testing.fails_on('postgresql+pygresql', 'uses pyformat')
@testing.fails_on('postgresql+zxjdbc', 'uses qmark')
@testing.fails_on('postgresql+psycopg2cffi', 'uses pyformat')
def test_expression_positional(self):
diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py
index 8818a9941..6bcc4cf9a 100644
--- a/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@ -544,11 +544,11 @@ class NumericInterpretationTest(fixtures.TestBase):
__backend__ = True
def test_numeric_codes(self):
- from sqlalchemy.dialects.postgresql import psycopg2cffi, pg8000, \
- psycopg2, base
+ from sqlalchemy.dialects.postgresql import pg8000, pygresql, \
+ psycopg2, psycopg2cffi, base
- dialects = (pg8000.dialect(), psycopg2.dialect(),
- psycopg2cffi.dialect())
+ dialects = (pg8000.dialect(), pygresql.dialect(),
+ psycopg2.dialect(), psycopg2cffi.dialect())
for dialect in dialects:
typ = Numeric().dialect_impl(dialect)
for code in base._INT_TYPES + base._FLOAT_TYPES + \
@@ -2757,7 +2757,10 @@ class JSONRoundTripTest(fixtures.TablesTest):
result = engine.execute(
select([data_table.c.data['k1'].astext])
).first()
- assert isinstance(result[0], util.text_type)
+ if engine.dialect.returns_unicode_strings:
+ assert isinstance(result[0], util.text_type)
+ else:
+ assert isinstance(result[0], util.string_types)
def test_query_returned_as_int(self):
engine = testing.db