summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-08-20 19:12:32 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-08-20 19:12:32 -0400
commit89ff6df7dcdfa144efbd4d7c2031c0643a266351 (patch)
treea28563e11c03ffacdbcd0740f6f555b7e6be469d
parent85e75ebcee15f216ace71628f1e491e36663d5c8 (diff)
downloadsqlalchemy-89ff6df7dcdfa144efbd4d7c2031c0643a266351.tar.gz
- pep8
-rw-r--r--test/sql/test_returning.py45
1 files changed, 29 insertions, 16 deletions
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 26dbcdaa2..79a0b38a5 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -1,13 +1,16 @@
from sqlalchemy.testing import eq_
-from sqlalchemy import *
from sqlalchemy import testing
from sqlalchemy.testing.schema import Table, Column
from sqlalchemy.types import TypeDecorator
from sqlalchemy.testing import fixtures, AssertsExecutionResults, engines, \
assert_raises_message
from sqlalchemy import exc as sa_exc
+from sqlalchemy import MetaData, String, Integer, Boolean, func, select, \
+ Sequence
import itertools
+table = GoofyType = seq = None
+
class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
__requires__ = 'returning',
@@ -31,11 +34,13 @@ class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
return value + "BAR"
table = Table(
- 'tables', meta, Column(
- 'id', Integer, primary_key=True, test_needs_autoincrement=True), Column(
- 'persons', Integer), Column(
- 'full', Boolean), Column(
- 'goofy', GoofyType(50)))
+ 'tables', meta,
+ Column(
+ 'id', Integer, primary_key=True,
+ test_needs_autoincrement=True),
+ Column('persons', Integer),
+ Column('full', Boolean),
+ Column('goofy', GoofyType(50)))
table.create(checkfirst=True)
def teardown(self):
@@ -47,9 +52,11 @@ class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
row = result.first()
assert row[table.c.id] == row['id'] == 1
- assert row[table.c.full] == row['full'] == False
+ assert row[table.c.full] == row['full']
+ assert row['full'] is False
- result = table.insert().values(persons=5, full=True, goofy="somegoofy").\
+ result = table.insert().values(
+ persons=5, full=True, goofy="somegoofy").\
returning(table.c.persons, table.c.full, table.c.goofy).execute()
row = result.first()
assert row[table.c.persons] == row['persons'] == 5
@@ -238,11 +245,13 @@ class ReturnDefaultsTest(fixtures.TablesTest):
return str(next(counter))
Table(
- "t1", metadata, Column(
- "id", Integer, primary_key=True, test_needs_autoincrement=True), Column(
- "data", String(50)), Column(
- "insdef", Integer, default=IncDefault()), Column(
- "upddef", Integer, onupdate=IncDefault()))
+ "t1", metadata,
+ Column(
+ "id", Integer, primary_key=True,
+ test_needs_autoincrement=True),
+ Column("data", String(50)),
+ Column("insdef", Integer, default=IncDefault()),
+ Column("upddef", Integer, onupdate=IncDefault()))
def test_chained_insert_pk(self):
t1 = self.tables.t1
@@ -336,9 +345,10 @@ class ReturnDefaultsTest(fixtures.TablesTest):
testing.db.execute(
t1.insert().values(upddef=1)
)
- result = testing.db.execute(t1.update().
- values(insdef=2).return_defaults(
- t1.c.data, t1.c.upddef))
+ result = testing.db.execute(
+ t1.update().
+ values(insdef=2).return_defaults(
+ t1.c.data, t1.c.upddef))
eq_(
dict(result.returned_defaults),
{"data": None, 'upddef': 1}
@@ -352,12 +362,14 @@ class ImplicitReturningFlag(fixtures.TestBase):
e = engines.testing_engine(options={'implicit_returning': False})
assert e.dialect.implicit_returning is False
c = e.connect()
+ c.close()
assert e.dialect.implicit_returning is False
def test_flag_turned_on(self):
e = engines.testing_engine(options={'implicit_returning': True})
assert e.dialect.implicit_returning is True
c = e.connect()
+ c.close()
assert e.dialect.implicit_returning is True
def test_flag_turned_default(self):
@@ -377,4 +389,5 @@ class ImplicitReturningFlag(fixtures.TestBase):
# version detection on connect sets it
c = e.connect()
+ c.close()
assert e.dialect.implicit_returning is supports[0]