- add __table_cls__ option to declarative, not publicized yet, is for the moment

for the benefit of the test.lib.schema package.
- use test.lib.schema.Table for the table within test.lib.fixtures.DeclarativeMappedTest
- [bug] Removed the check for number of
rows affected when doing a multi-delete
against mapped objects.   If an ON DELETE
CASCADE exists between two rows, we can't
get an accurate rowcount from the DBAPI;
this particular count is not supported
on most DBAPIs in any case, MySQLdb
is the notable case where it is.
[ticket:2403]

2 files changed, 15 insertions, 13 deletions

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 891130a48..faf575da1 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -1213,6 +1213,12 @@ def _as_declarative(cls, classname, dict_):
                 del our_stuff[key]
     cols = sorted(cols, key=lambda c:c._creation_order)
     table = None
+
+    if hasattr(cls, '__table_cls__'):
+        table_cls = util.unbound_method_to_callable(cls.__table_cls__)
+    else:
+        table_cls = Table
+
     if '__table__' not in dict_:
         if tablename is not None:
 
@@ -1230,7 +1236,7 @@ def _as_declarative(cls, classname, dict_):
             if autoload:
                 table_kw['autoload'] = True
 
-            cls.__table__ = table = Table(tablename, cls.metadata,
+            cls.__table__ = table = table_cls(tablename, cls.metadata,
                                           *(tuple(cols) + tuple(args)),
                                            **table_kw)
     else:
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 31c9891b8..55b9bf84a 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -642,12 +642,10 @@ def _emit_delete_statements(base_mapper, uowtransaction, cached_connections,
 
     for connection, del_objects in delete.iteritems():
         statement = base_mapper._memo(('delete', table), delete_stmt)
-        rows = -1
 
         connection = cached_connections[connection]
 
-        if need_version_id and \
-                not connection.dialect.supports_sane_multi_rowcount:
+        if need_version_id:
             # TODO: need test coverage for this [ticket:1761]
             if connection.dialect.supports_sane_rowcount:
                 rows = 0
@@ -656,6 +654,12 @@ def _emit_delete_statements(base_mapper, uowtransaction, cached_connections,
                 for params in del_objects:
                     c = connection.execute(statement, params)
                     rows += c.rowcount
+                if rows != len(del_objects):
+                    raise orm_exc.StaleDataError(
+                        "DELETE statement on table '%s' expected to "
+                        "delete %d row(s); %d were matched." % 
+                        (table.description, len(del_objects), c.rowcount)
+                    )
             else:
                 util.warn(
                     "Dialect %s does not support deleted rowcount "
@@ -664,16 +668,8 @@ def _emit_delete_statements(base_mapper, uowtransaction, cached_connections,
                     stacklevel=12)
                 connection.execute(statement, del_objects)
         else:
-            c = connection.execute(statement, del_objects)
-            if connection.dialect.supports_sane_multi_rowcount:
-                rows = c.rowcount
+            connection.execute(statement, del_objects)
 
-        if rows != -1 and rows != len(del_objects):
-            raise orm_exc.StaleDataError(
-                "DELETE statement on table '%s' expected to "
-                "delete %d row(s); %d were matched." % 
-                (table.description, len(del_objects), c.rowcount)
-            )
 
 def _finalize_insert_update_commands(base_mapper, uowtransaction, 
                             states_to_insert, states_to_update):