1 files changed, 143 insertions, 2 deletions
diff --git a/test/sql/test_delete.py b/test/sql/test_delete.py
index 904dcee3f..7d18db9c9 100644
--- a/test/sql/test_delete.py
+++ b/test/sql/test_delete.py
@@ -1,9 +1,11 @@
 #! coding:utf-8
 
-from sqlalchemy import Column, Integer, String, Table, delete, select, and_, \
+from sqlalchemy import Integer, String, ForeignKey, delete, select, and_, \
     or_
 from sqlalchemy.dialects import mysql
-from sqlalchemy.testing import AssertsCompiledSQL, fixtures
+from sqlalchemy import testing
+from sqlalchemy.testing import AssertsCompiledSQL, fixtures, eq_
+from sqlalchemy.testing.schema import Table, Column
 
 
 class _DeleteTestBase(object):
@@ -99,3 +101,142 @@ class DeleteTest(_DeleteTestBase, fixtures.TablesTest, AssertsCompiledSQL):
                             'FROM myothertable '
                             'WHERE myothertable.otherid = mytable.myid'
                             ')')
+
+
+class DeleteFromRoundTripTest(fixtures.TablesTest):
+    __backend__ = True
+
+    @classmethod
+    def define_tables(cls, metadata):
+        Table('mytable', metadata,
+              Column('myid', Integer),
+              Column('name', String(30)),
+              Column('description', String(50)))
+        Table('myothertable', metadata,
+              Column('otherid', Integer),
+              Column('othername', String(30)))
+        Table('users', metadata,
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('name', String(30), nullable=False))
+        Table('addresses', metadata,
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('user_id', None, ForeignKey('users.id')),
+              Column('name', String(30), nullable=False),
+              Column('email_address', String(50), nullable=False))
+        Table('dingalings', metadata,
+              Column('id', Integer, primary_key=True,
+                     test_needs_autoincrement=True),
+              Column('address_id', None, ForeignKey('addresses.id')),
+              Column('data', String(30)))
+        Table('update_w_default', metadata,
+              Column('id', Integer, primary_key=True),
+              Column('x', Integer),
+              Column('ycol', Integer, key='y'),
+              Column('data', String(30), onupdate=lambda: "hi"))
+
+    @classmethod
+    def fixtures(cls):
+        return dict(
+            users=(
+                ('id', 'name'),
+                (7, 'jack'),
+                (8, 'ed'),
+                (9, 'fred'),
+                (10, 'chuck')
+            ),
+            addresses=(
+                ('id', 'user_id', 'name', 'email_address'),
+                (1, 7, 'x', 'jack@bean.com'),
+                (2, 8, 'x', 'ed@wood.com'),
+                (3, 8, 'x', 'ed@bettyboop.com'),
+                (4, 8, 'x', 'ed@lala.com'),
+                (5, 9, 'x', 'fred@fred.com')
+            ),
+            dingalings=(
+                ('id', 'address_id', 'data'),
+                (1, 2, 'ding 1/2'),
+                (2, 5, 'ding 2/5')
+            ),
+        )
+
+    @testing.requires.delete_from
+    def test_exec_two_table(self):
+        users, addresses = self.tables.users, self.tables.addresses
+        dingalings = self.tables.dingalings
+
+        with testing.db.connect() as conn:
+            conn.execute(dingalings.delete())  # fk violation otherwise
+
+            conn.execute(
+                addresses.delete().
+                where(users.c.id == addresses.c.user_id).
+                where(users.c.name == 'ed')
+            )
+
+            expected = [
+                (1, 7, 'x', 'jack@bean.com'),
+                (5, 9, 'x', 'fred@fred.com')
+            ]
+        self._assert_table(addresses, expected)
+
+    @testing.requires.delete_from
+    def test_exec_three_table(self):
+        users = self.tables.users
+        addresses = self.tables.addresses
+        dingalings = self.tables.dingalings
+
+        testing.db.execute(
+            dingalings.delete().
+            where(users.c.id == addresses.c.user_id).
+            where(users.c.name == 'ed').
+            where(addresses.c.id == dingalings.c.address_id))
+
+        expected = [
+            (2, 5, 'ding 2/5')
+        ]
+        self._assert_table(dingalings, expected)
+
+    @testing.requires.delete_from
+    def test_exec_two_table_plus_alias(self):
+        users, addresses = self.tables.users, self.tables.addresses
+        dingalings = self.tables.dingalings
+
+        with testing.db.connect() as conn:
+            conn.execute(dingalings.delete())  # fk violation otherwise
+            a1 = addresses.alias()
+            conn.execute(
+                addresses.delete().
+                where(users.c.id == addresses.c.user_id).
+                where(users.c.name == 'ed').
+                where(a1.c.id == addresses.c.id)
+            )
+
+        expected = [
+            (1, 7, 'x', 'jack@bean.com'),
+            (5, 9, 'x', 'fred@fred.com')
+        ]
+        self._assert_table(addresses, expected)
+
+    @testing.requires.delete_from
+    def test_exec_alias_plus_table(self):
+        users, addresses = self.tables.users, self.tables.addresses
+        dingalings = self.tables.dingalings
+
+        d1 = dingalings.alias()
+
+        testing.db.execute(
+            delete(d1).
+            where(users.c.id == addresses.c.user_id).
+            where(users.c.name == 'ed').
+            where(addresses.c.id == d1.c.address_id))
+
+        expected = [
+            (2, 5, 'ding 2/5')
+        ]
+        self._assert_table(dingalings, expected)
+
+    def _assert_table(self, table, expected):
+        stmt = table.select().order_by(table.c.id)
+        eq_(testing.db.execute(stmt).fetchall(), expected)