diff options
author | Tony Locke <tlocke@tlocke.org.uk> | 2014-06-23 20:45:16 +0100 |
---|---|---|
committer | Tony Locke <tlocke@tlocke.org.uk> | 2014-07-06 23:13:44 +0100 |
commit | 73d00339c4f6424714f63470f053a749c319d899 (patch) | |
tree | 3e20abd8e3b4d995053184818adf6d3336dd8f4b | |
parent | 7c29cff14d8f3dd5ecfb39fdeb8d6a161333d722 (diff) | |
download | sqlalchemy-73d00339c4f6424714f63470f053a749c319d899.tar.gz |
pg8000 passing test/sql
-rw-r--r-- | test/sql/test_case_statement.py | 20 | ||||
-rw-r--r-- | test/sql/test_defaults.py | 4 | ||||
-rw-r--r-- | test/sql/test_query.py | 4 | ||||
-rw-r--r-- | test/sql/test_types.py | 1 |
4 files changed, 16 insertions, 13 deletions
diff --git a/test/sql/test_case_statement.py b/test/sql/test_case_statement.py index 998a55cd8..2966fd9ba 100644 --- a/test/sql/test_case_statement.py +++ b/test/sql/test_case_statement.py @@ -73,14 +73,18 @@ class CaseTest(fixtures.TestBase, AssertsCompiledSQL): ('gt3', 6, 'pk_6_data') ] - w_else = select([case([ - [info_table.c.pk < 3, - 3], - [and_(info_table.c.pk >= 3, info_table.c.pk < 6), - 6]], - else_ = 0).label('x'), - info_table.c.pk, info_table.c.info], - from_obj=[info_table]) + w_else = select( + [ + case( + [ + [info_table.c.pk < 3, cast(3, Integer)], + [ + and_( + info_table.c.pk >= 3, info_table.c.pk < 6), + 6]], + else_ = 0).label('x'), + info_table.c.pk, info_table.c.info], + from_obj=[info_table]) else_result = w_else.execute().fetchall() diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py index ba6166ea6..d511de229 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -6,7 +6,7 @@ import sqlalchemy as sa from sqlalchemy import testing from sqlalchemy.testing import engines from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc,\ - Sequence, func, literal, Unicode + Sequence, func, literal, Unicode, cast from sqlalchemy.types import TypeDecorator, TypeEngine from sqlalchemy.testing.schema import Table, Column from sqlalchemy.dialects import sqlite @@ -1064,7 +1064,7 @@ class SpecialTypePKTest(fixtures.TestBase): self._run_test(server_default='1', autoincrement=False) def test_clause(self): - stmt = select([literal("INT_1", type_=self.MyInteger)]).as_scalar() + stmt = select([cast("INT_1", type_=self.MyInteger)]).as_scalar() self._run_test(default=stmt) @testing.requires.returning diff --git a/test/sql/test_query.py b/test/sql/test_query.py index 65bb2e07c..ca2150443 100644 --- a/test/sql/test_query.py +++ b/test/sql/test_query.py @@ -610,11 +610,11 @@ class QueryTest(fixtures.TestBase): return "INT_%d" % value eq_( - testing.db.scalar(select([literal("INT_5", type_=MyInteger)])), + testing.db.scalar(select([cast("INT_5", type_=MyInteger)])), "INT_5" ) eq_( - testing.db.scalar(select([literal("INT_5", type_=MyInteger).label('foo')])), + testing.db.scalar(select([cast("INT_5", type_=MyInteger).label('foo')])), "INT_5" ) diff --git a/test/sql/test_types.py b/test/sql/test_types.py index 1130c9e40..0e82fcd6b 100644 --- a/test/sql/test_types.py +++ b/test/sql/test_types.py @@ -756,7 +756,6 @@ class TypeCoerceCastTest(fixtures.TablesTest): select([coerce_fn(t.c.data, MyType)]).execute().fetchall(), [('BIND_INd1BIND_OUT', )]) - class VariantTest(fixtures.TestBase, AssertsCompiledSQL): def setup(self): class UTypeOne(types.UserDefinedType): |