From 3351c35edb548df1ebaad30eb597a79b27b8b7fa Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 28 Dec 2010 15:01:19 -0500 Subject: - merge rfc0b9df5d9e0 from 0.6 branch --- lib/sqlalchemy/orm/mapper.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/sqlalchemy/orm') diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index e9271008e..346d7d4bf 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -279,6 +279,17 @@ class Mapper(object): if self.version_id_col is None: self.version_id_col = self.inherits.version_id_col self.version_id_generator = self.inherits.version_id_generator + elif self.inherits.version_id_col is not None and \ + self.version_id_col is not self.inherits.version_id_col: + util.warn( + "Inheriting version_id_col '%s' does not match inherited " + "version_id_col '%s' and will not automatically populate " + "the inherited versioning column. " + "version_id_col should only be specified on " + "the base-most mapper that includes versioning." % + (self.version_id_col.description, + self.inherits.version_id_col.description) + ) if self.order_by is False and \ not self.concrete and \ -- cgit v1.2.1