[SQL-CVS] r3328 - in SQLObject/trunk: docs sqlobject/inheritance

[<sub...@co...>]

Author: phd
Date: 2008-03-11 06:46:09 -0600 (Tue, 11 Mar 2008)
New Revision: 3328

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/inheritance/__init__.py
Log:
A bug in inheritable delColumn() that doesn't removes properties was fixed.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2008-03-11 12:45:44 UTC (rev 3327)
+++ SQLObject/trunk/docs/News.txt	2008-03-11 12:46:09 UTC (rev 3328)
@@ -86,6 +86,11 @@
 * Under MySQL, PickleCol no longer used TEXT column types; the smallest
   column is now BLOB - it is not possible to create TINYBLOB column.
 
+SQLObject 0.9.6
+===============
+
+* A bug in inheritable delColumn() that doesn't removes properties was fixed.
+
 SQLObject 0.9.5
 ===============
 

Modified: SQLObject/trunk/sqlobject/inheritance/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/__init__.py	2008-03-11 12:45:44 UTC (rev 3327)
+++ SQLObject/trunk/sqlobject/inheritance/__init__.py	2008-03-11 12:46:09 UTC (rev 3328)
@@ -2,7 +2,7 @@
 from sqlobject import classregistry
 from sqlobject.col import StringCol, ForeignKey
 from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
-   makeProperties, getterName, setterName
+   makeProperties, unmakeProperties, getterName, setterName
 import iteration
 
 def tablesUsedSet(obj, db):
@@ -126,19 +126,27 @@
 
     addColumn = classmethod(addColumn)
 
-    def delColumn(sqlmeta, column, changeSchema=False, connection=None):
-        soClass = sqlmeta.soClass
+    def delColumn(sqlmeta, column, changeSchema=False, connection=None, childUpdate=False):
+        if childUpdate:
+            soClass = sqlmeta.soClass
+            unmakeProperties(soClass)
+            makeProperties(soClass)
+
+            if isinstance(column, str):
+                name = column
+            else:
+                name = column.name
+            delattr(soClass, name)
+            delattr(soClass.q, name)
+            return
+
         super(InheritableSQLMeta, sqlmeta).delColumn(column, changeSchema, connection)
 
-        if isinstance(column, str):
-            name = column
-        else:
-            name = column.name
-
         #DSM: Update each child class if needed
         #DSM: and delete properties for this column
         for c in sqlmeta.childClasses.values():
-            delattr(c.q, name)
+            c.sqlmeta.delColumn(column, changeSchema=changeSchema,
+                connection=connection, childUpdate=True)
 
     delColumn = classmethod(delColumn)
 
@@ -173,15 +181,19 @@
 
     addJoin = classmethod(addJoin)
 
-    def delJoin(sqlmeta, joinDef):
-        soClass = sqlmeta.soClass
+    def delJoin(sqlmeta, joinDef, childUpdate=False):
+        if childUpdate:
+            soClass = sqlmeta.soClass
+            unmakeProperties(soClass)
+            makeProperties(soClass)
+            return
+
         super(InheritableSQLMeta, sqlmeta).delJoin(joinDef)
 
         #DSM: Update each child class if needed
         #DSM: and delete properties for this join
         for c in sqlmeta.childClasses.values():
-            # FIXME: what is ``meth``?
-            delattr(c, meth)
+            c.sqlmeta.delJoin(joinDef, childUpdate=True)
 
     delJoin = classmethod(delJoin)