From 1e1a38e7801f410f244e4bbb44ec795ae152e04e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 6 Jan 2019 01:14:26 -0500 Subject: Run black -l 79 against all source files This is a straight reformat run using black as is, with no edits applied at all. The black run will format code consistently, however in some cases that are prevalent in SQLAlchemy code it produces too-long lines. The too-long lines will be resolved in the following commit that will resolve all remaining flake8 issues including shadowed builtins, long lines, import order, unused imports, duplicate imports, and docstring issues. Change-Id: I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9 --- test/dialect/postgresql/test_on_conflict.py | 352 ++++++++++++++++------------ 1 file changed, 196 insertions(+), 156 deletions(-) (limited to 'test/dialect/postgresql/test_on_conflict.py') diff --git a/test/dialect/postgresql/test_on_conflict.py b/test/dialect/postgresql/test_on_conflict.py index c3e1b9158..4e73c3840 100644 --- a/test/dialect/postgresql/test_on_conflict.py +++ b/test/dialect/postgresql/test_on_conflict.py @@ -10,16 +10,17 @@ from sqlalchemy.dialects.postgresql import insert class OnConflictTest(fixtures.TablesTest): - __only_on__ = 'postgresql >= 9.5', + __only_on__ = ("postgresql >= 9.5",) __backend__ = True - run_define_tables = 'each' + run_define_tables = "each" @classmethod def define_tables(cls, metadata): Table( - 'users', metadata, - Column('id', Integer, primary_key=True), - Column('name', String(50)) + "users", + metadata, + Column("id", Integer, primary_key=True), + Column("name", String(50)), ) class SpecialType(sqltypes.TypeDecorator): @@ -29,49 +30,57 @@ class OnConflictTest(fixtures.TablesTest): return value + " processed" Table( - 'bind_targets', metadata, - Column('id', Integer, primary_key=True), - Column('data', SpecialType()) + "bind_targets", + metadata, + Column("id", Integer, primary_key=True), + Column("data", SpecialType()), ) users_xtra = Table( - 'users_xtra', metadata, - Column('id', Integer, primary_key=True), - Column('name', String(50)), - Column('login_email', String(50)), - Column('lets_index_this', String(50)) + "users_xtra", + metadata, + Column("id", Integer, primary_key=True), + Column("name", String(50)), + Column("login_email", String(50)), + Column("lets_index_this", String(50)), ) cls.unique_partial_index = schema.Index( - 'idx_unique_partial_name', - users_xtra.c.name, users_xtra.c.lets_index_this, + "idx_unique_partial_name", + users_xtra.c.name, + users_xtra.c.lets_index_this, unique=True, - postgresql_where=users_xtra.c.lets_index_this == 'unique_name') + postgresql_where=users_xtra.c.lets_index_this == "unique_name", + ) cls.unique_constraint = schema.UniqueConstraint( - users_xtra.c.login_email, name='uq_login_email') + users_xtra.c.login_email, name="uq_login_email" + ) cls.bogus_index = schema.Index( - 'idx_special_ops', + "idx_special_ops", users_xtra.c.lets_index_this, - postgresql_where=users_xtra.c.lets_index_this > 'm') + postgresql_where=users_xtra.c.lets_index_this > "m", + ) def test_bad_args(self): assert_raises( ValueError, insert(self.tables.users).on_conflict_do_nothing, - constraint='id', index_elements=['id'] + constraint="id", + index_elements=["id"], ) assert_raises( ValueError, insert(self.tables.users).on_conflict_do_update, - constraint='id', index_elements=['id'] + constraint="id", + index_elements=["id"], ) assert_raises( ValueError, - insert(self.tables.users).on_conflict_do_update, constraint='id' + insert(self.tables.users).on_conflict_do_update, + constraint="id", ) assert_raises( - ValueError, - insert(self.tables.users).on_conflict_do_update + ValueError, insert(self.tables.users).on_conflict_do_update ) def test_on_conflict_do_nothing(self): @@ -80,22 +89,21 @@ class OnConflictTest(fixtures.TablesTest): with testing.db.connect() as conn: result = conn.execute( insert(users).on_conflict_do_nothing(), - - dict(id=1, name='name1') + dict(id=1, name="name1"), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) result = conn.execute( insert(users).on_conflict_do_nothing(), - dict(id=1, name='name2') + dict(id=1, name="name2"), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name1')] + [(1, "name1")], ) def test_on_conflict_do_nothing_connectionless(self): @@ -104,25 +112,25 @@ class OnConflictTest(fixtures.TablesTest): with testing.db.connect() as conn: result = conn.execute( insert(users).on_conflict_do_nothing( - constraint='uq_login_email'), - - dict(name='name1', login_email='email1') + constraint="uq_login_email" + ), + dict(name="name1", login_email="email1"), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, (1,)) result = testing.db.execute( - insert(users).on_conflict_do_nothing( - constraint='uq_login_email' - ), - dict(name='name2', login_email='email1') + insert(users).on_conflict_do_nothing(constraint="uq_login_email"), + dict(name="name2", login_email="email1"), ) eq_(result.inserted_primary_key, None) eq_(result.returned_defaults, None) eq_( - testing.db.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name1', 'email1', None)] + testing.db.execute( + users.select().where(users.c.id == 1) + ).fetchall(), + [(1, "name1", "email1", None)], ) @testing.provide_metadata @@ -131,100 +139,100 @@ class OnConflictTest(fixtures.TablesTest): with testing.db.connect() as conn: result = conn.execute( - insert(users) - .on_conflict_do_nothing( - index_elements=users.primary_key.columns), - dict(id=1, name='name1') + insert(users).on_conflict_do_nothing( + index_elements=users.primary_key.columns + ), + dict(id=1, name="name1"), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) result = conn.execute( - insert(users) - .on_conflict_do_nothing( - index_elements=users.primary_key.columns), - dict(id=1, name='name2') + insert(users).on_conflict_do_nothing( + index_elements=users.primary_key.columns + ), + dict(id=1, name="name2"), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name1')] + [(1, "name1")], ) def test_on_conflict_do_update_one(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) + conn.execute(users.insert(), dict(id=1, name="name1")) i = insert(users) i = i.on_conflict_do_update( - index_elements=[users.c.id], - set_=dict(name=i.excluded.name)) - result = conn.execute(i, dict(id=1, name='name1')) + index_elements=[users.c.id], set_=dict(name=i.excluded.name) + ) + result = conn.execute(i, dict(id=1, name="name1")) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name1')] + [(1, "name1")], ) def test_on_conflict_do_update_two(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) + conn.execute(users.insert(), dict(id=1, name="name1")) i = insert(users) i = i.on_conflict_do_update( index_elements=[users.c.id], - set_=dict(id=i.excluded.id, name=i.excluded.name) + set_=dict(id=i.excluded.id, name=i.excluded.name), ) - result = conn.execute(i, dict(id=1, name='name2')) + result = conn.execute(i, dict(id=1, name="name2")) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name2')] + [(1, "name2")], ) def test_on_conflict_do_update_three(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) + conn.execute(users.insert(), dict(id=1, name="name1")) i = insert(users) i = i.on_conflict_do_update( index_elements=users.primary_key.columns, - set_=dict(name=i.excluded.name) + set_=dict(name=i.excluded.name), ) - result = conn.execute(i, dict(id=1, name='name3')) + result = conn.execute(i, dict(id=1, name="name3")) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name3')] + [(1, "name3")], ) def test_on_conflict_do_update_four(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) + conn.execute(users.insert(), dict(id=1, name="name1")) i = insert(users) i = i.on_conflict_do_update( index_elements=users.primary_key.columns, - set_=dict(id=i.excluded.id, name=i.excluded.name) - ).values(id=1, name='name4') + set_=dict(id=i.excluded.id, name=i.excluded.name), + ).values(id=1, name="name4") result = conn.execute(i) eq_(result.inserted_primary_key, [1]) @@ -232,20 +240,20 @@ class OnConflictTest(fixtures.TablesTest): eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name4')] + [(1, "name4")], ) def test_on_conflict_do_update_five(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) + conn.execute(users.insert(), dict(id=1, name="name1")) i = insert(users) i = i.on_conflict_do_update( index_elements=users.primary_key.columns, - set_=dict(id=10, name="I'm a name") - ).values(id=1, name='name4') + set_=dict(id=10, name="I'm a name"), + ).values(id=1, name="name4") result = conn.execute(i) eq_(result.inserted_primary_key, [1]) @@ -253,42 +261,39 @@ class OnConflictTest(fixtures.TablesTest): eq_( conn.execute( - users.select().where(users.c.id == 10)).fetchall(), - [(10, "I'm a name")] + users.select().where(users.c.id == 10) + ).fetchall(), + [(10, "I'm a name")], ) def test_on_conflict_do_update_multivalues(self): users = self.tables.users with testing.db.connect() as conn: - conn.execute(users.insert(), dict(id=1, name='name1')) - conn.execute(users.insert(), dict(id=2, name='name2')) + conn.execute(users.insert(), dict(id=1, name="name1")) + conn.execute(users.insert(), dict(id=2, name="name2")) i = insert(users) i = i.on_conflict_do_update( index_elements=users.primary_key.columns, set_=dict(name="updated"), - where=(i.excluded.name != 'name12') - ).values([ - dict(id=1, name='name11'), - dict(id=2, name='name12'), - dict(id=3, name='name13'), - dict(id=4, name='name14'), - ]) + where=(i.excluded.name != "name12"), + ).values( + [ + dict(id=1, name="name11"), + dict(id=2, name="name12"), + dict(id=3, name="name13"), + dict(id=4, name="name14"), + ] + ) result = conn.execute(i) eq_(result.inserted_primary_key, [None]) eq_(result.returned_defaults, None) eq_( - conn.execute( - users.select().order_by(users.c.id)).fetchall(), - [ - (1, "updated"), - (2, "name2"), - (3, "name13"), - (4, "name14") - ] + conn.execute(users.select().order_by(users.c.id)).fetchall(), + [(1, "updated"), (2, "name2"), (3, "name13"), (4, "name14")], ) def _exotic_targets_fixture(self, conn): @@ -297,21 +302,25 @@ class OnConflictTest(fixtures.TablesTest): conn.execute( insert(users), dict( - id=1, name='name1', - login_email='name1@gmail.com', lets_index_this='not' - ) + id=1, + name="name1", + login_email="name1@gmail.com", + lets_index_this="not", + ), ) conn.execute( users.insert(), dict( - id=2, name='name2', - login_email='name2@gmail.com', lets_index_this='not' - ) + id=2, + name="name2", + login_email="name2@gmail.com", + lets_index_this="not", + ), ) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name1', 'name1@gmail.com', 'not')] + [(1, "name1", "name1@gmail.com", "not")], ) def test_on_conflict_do_update_exotic_targets_two(self): @@ -324,19 +333,24 @@ class OnConflictTest(fixtures.TablesTest): i = i.on_conflict_do_update( index_elements=users.primary_key.columns, set_=dict( - name=i.excluded.name, - login_email=i.excluded.login_email) + name=i.excluded.name, login_email=i.excluded.login_email + ), ) - result = conn.execute(i, dict( - id=1, name='name2', login_email='name1@gmail.com', - lets_index_this='not') + result = conn.execute( + i, + dict( + id=1, + name="name2", + login_email="name1@gmail.com", + lets_index_this="not", + ), ) eq_(result.inserted_primary_key, [1]) eq_(result.returned_defaults, None) eq_( conn.execute(users.select().where(users.c.id == 1)).fetchall(), - [(1, 'name2', 'name1@gmail.com', 'not')] + [(1, "name2", "name1@gmail.com", "not")], ) def test_on_conflict_do_update_exotic_targets_three(self): @@ -349,23 +363,32 @@ class OnConflictTest(fixtures.TablesTest): i = insert(users) i = i.on_conflict_do_update( constraint=self.unique_constraint, - set_=dict(id=i.excluded.id, name=i.excluded.name, - login_email=i.excluded.login_email) + set_=dict( + id=i.excluded.id, + name=i.excluded.name, + login_email=i.excluded.login_email, + ), ) # note: lets_index_this value totally ignored in SET clause. - result = conn.execute(i, dict( - id=42, name='nameunique', - login_email='name2@gmail.com', lets_index_this='unique') + result = conn.execute( + i, + dict( + id=42, + name="nameunique", + login_email="name2@gmail.com", + lets_index_this="unique", + ), ) eq_(result.inserted_primary_key, [42]) eq_(result.returned_defaults, None) eq_( conn.execute( - users.select(). - where(users.c.login_email == 'name2@gmail.com') + users.select().where( + users.c.login_email == "name2@gmail.com" + ) ).fetchall(), - [(42, 'nameunique', 'name2@gmail.com', 'not')] + [(42, "nameunique", "name2@gmail.com", "not")], ) def test_on_conflict_do_update_exotic_targets_four(self): @@ -379,24 +402,32 @@ class OnConflictTest(fixtures.TablesTest): i = i.on_conflict_do_update( constraint=self.unique_constraint.name, set_=dict( - id=i.excluded.id, name=i.excluded.name, - login_email=i.excluded.login_email) + id=i.excluded.id, + name=i.excluded.name, + login_email=i.excluded.login_email, + ), ) # note: lets_index_this value totally ignored in SET clause. - result = conn.execute(i, dict( - id=43, name='nameunique2', - login_email='name2@gmail.com', lets_index_this='unique') + result = conn.execute( + i, + dict( + id=43, + name="nameunique2", + login_email="name2@gmail.com", + lets_index_this="unique", + ), ) eq_(result.inserted_primary_key, [43]) eq_(result.returned_defaults, None) eq_( conn.execute( - users.select(). - where(users.c.login_email == 'name2@gmail.com') + users.select().where( + users.c.login_email == "name2@gmail.com" + ) ).fetchall(), - [(43, 'nameunique2', 'name2@gmail.com', 'not')] + [(43, "nameunique2", "name2@gmail.com", "not")], ) def test_on_conflict_do_update_exotic_targets_four_no_pk(self): @@ -410,23 +441,24 @@ class OnConflictTest(fixtures.TablesTest): i = i.on_conflict_do_update( index_elements=[users.c.login_email], set_=dict( - id=i.excluded.id, name=i.excluded.name, - login_email=i.excluded.login_email) + id=i.excluded.id, + name=i.excluded.name, + login_email=i.excluded.login_email, + ), ) - result = conn.execute(i, dict( - name='name3', - login_email='name1@gmail.com') + result = conn.execute( + i, dict(name="name3", login_email="name1@gmail.com") ) eq_(result.inserted_primary_key, [1]) - eq_(result.returned_defaults, (1, )) + eq_(result.returned_defaults, (1,)) eq_( conn.execute(users.select().order_by(users.c.id)).fetchall(), [ - (1, 'name3', 'name1@gmail.com', 'not'), - (2, 'name2', 'name2@gmail.com', 'not') - ] + (1, "name3", "name1@gmail.com", "not"), + (2, "name2", "name2@gmail.com", "not"), + ], ) def test_on_conflict_do_update_exotic_targets_five(self): @@ -438,18 +470,24 @@ class OnConflictTest(fixtures.TablesTest): i = insert(users) i = i.on_conflict_do_update( index_elements=self.bogus_index.columns, - index_where=self. - bogus_index.dialect_options['postgresql']['where'], + index_where=self.bogus_index.dialect_options["postgresql"][ + "where" + ], set_=dict( - name=i.excluded.name, - login_email=i.excluded.login_email) + name=i.excluded.name, login_email=i.excluded.login_email + ), ) assert_raises( - exc.ProgrammingError, conn.execute, i, + exc.ProgrammingError, + conn.execute, + i, dict( - id=1, name='namebogus', login_email='bogus@gmail.com', - lets_index_this='bogus') + id=1, + name="namebogus", + login_email="bogus@gmail.com", + lets_index_this="bogus", + ), ) def test_on_conflict_do_update_exotic_targets_six(self): @@ -459,35 +497,38 @@ class OnConflictTest(fixtures.TablesTest): conn.execute( insert(users), dict( - id=1, name='name1', - login_email='mail1@gmail.com', - lets_index_this='unique_name' - ) + id=1, + name="name1", + login_email="mail1@gmail.com", + lets_index_this="unique_name", + ), ) i = insert(users) i = i.on_conflict_do_update( index_elements=self.unique_partial_index.columns, - index_where=self.unique_partial_index.dialect_options - ['postgresql']['where'], + index_where=self.unique_partial_index.dialect_options[ + "postgresql" + ]["where"], set_=dict( - name=i.excluded.name, - login_email=i.excluded.login_email), + name=i.excluded.name, login_email=i.excluded.login_email + ), ) conn.execute( i, [ - dict(name='name1', login_email='mail2@gmail.com', - lets_index_this='unique_name'), - ] + dict( + name="name1", + login_email="mail2@gmail.com", + lets_index_this="unique_name", + ) + ], ) eq_( conn.execute(users.select()).fetchall(), - [ - (1, 'name1', 'mail2@gmail.com', 'unique_name'), - ] + [(1, "name1", "mail2@gmail.com", "unique_name")], ) def test_on_conflict_do_update_no_row_actually_affected(self): @@ -498,11 +539,12 @@ class OnConflictTest(fixtures.TablesTest): i = insert(users) i = i.on_conflict_do_update( index_elements=[users.c.login_email], - set_=dict(name='new_name'), - where=(i.excluded.name == 'other_name') + set_=dict(name="new_name"), + where=(i.excluded.name == "other_name"), ) result = conn.execute( - i, dict(name='name2', login_email='name1@gmail.com')) + i, dict(name="name2", login_email="name1@gmail.com") + ) eq_(result.returned_defaults, None) eq_(result.inserted_primary_key, None) @@ -510,9 +552,9 @@ class OnConflictTest(fixtures.TablesTest): eq_( conn.execute(users.select()).fetchall(), [ - (1, 'name1', 'name1@gmail.com', 'not'), - (2, 'name2', 'name2@gmail.com', 'not') - ] + (1, "name1", "name1@gmail.com", "not"), + (2, "name2", "name2@gmail.com", "not"), + ], ) def test_on_conflict_do_update_special_types_in_set(self): @@ -524,19 +566,17 @@ class OnConflictTest(fixtures.TablesTest): eq_( conn.scalar(sql.select([bind_targets.c.data])), - "initial data processed" + "initial data processed", ) i = insert(bind_targets) i = i.on_conflict_do_update( index_elements=[bind_targets.c.id], - set_=dict(data="new updated data") - ) - conn.execute( - i, {"id": 1, "data": "new inserted data"} + set_=dict(data="new updated data"), ) + conn.execute(i, {"id": 1, "data": "new inserted data"}) eq_( conn.scalar(sql.select([bind_targets.c.data])), - "new updated data processed" + "new updated data processed", ) -- cgit v1.2.1