[SQL-CVS] r542 - in home/phd/SQLObject/inheritance: docs sqlobject

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

Author: phd
Date: 2005-01-14 13:53:41 +0000 (Fri, 14 Jan 2005)
New Revision: 542

Modified:
   home/phd/SQLObject/inheritance/docs/SQLObject.txt
   home/phd/SQLObject/inheritance/sqlobject/col.py
Log:
Merged patches from revisions 539:541.

Modified: home/phd/SQLObject/inheritance/docs/SQLObject.txt
===================================================================
--- home/phd/SQLObject/inheritance/docs/SQLObject.txt	2005-01-14 13:52:12 UTC (rev 541)
+++ home/phd/SQLObject/inheritance/docs/SQLObject.txt	2005-01-14 13:53:41 UTC (rev 542)
@@ -1082,9 +1082,10 @@
 `MySQLConnection` takes the keyword arguments `host`, `db`, `user`,
 and `passwd`, just like `MySQLdb.connect` does.
 
-MySQLConnection supports all the features, though MySQL does not
-support transactions_ (except using a special proprietary backend that
-I haven't used).
+MySQLConnection supports all the features, though MySQL only supports
+transactions_ when using the InnoDB backend, and SQLObject currently
+does not have support for explicitly defining the backend when using
+``createTable``.
 
 Postgres
 --------

Modified: home/phd/SQLObject/inheritance/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/col.py	2005-01-14 13:52:12 UTC (rev 541)
+++ home/phd/SQLObject/inheritance/sqlobject/col.py	2005-01-14 13:53:41 UTC (rev 542)
@@ -898,7 +898,7 @@
 
 all = []
 for key, value in globals().items():
-    if isinstance(value, type) and issubclass(value, (Col, SOCol)):
+    if isinstance(value, type) and (issubclass(value, Col) or issubclass(value, SOCol)):
         all.append(key)
 __all__.extend(all)
 del all