[z3-checkins] r18715 - in z3/sqlos/trunk: . interfaces

[jinty at codespeak.net]

Author: jinty
Date: Mon Oct 17 13:29:07 2005
New Revision: 18715

Modified:
   z3/sqlos/trunk/README.txt
   z3/sqlos/trunk/ftesting.zcml
   z3/sqlos/trunk/interfaces/__init__.py
   z3/sqlos/trunk/metaconfigure.py
Log:
Merge 18709:18712 from the SQLObject 0.7 branch. I had mistakenly committed
these patches there.


Modified: z3/sqlos/trunk/README.txt
==============================================================================
--- z3/sqlos/trunk/README.txt	(original)
+++ z3/sqlos/trunk/README.txt	Mon Oct 17 13:29:07 2005
@@ -49,7 +49,7 @@
 Dependencies
 ------------
 
-    + SQLObject >= 0.6
+    + SQLObject >= 0.7
 
         Place the sqlobject package somewhere in python's sys.path
         ($ZOPEHOME/lib/python is a good location).

Modified: z3/sqlos/trunk/ftesting.zcml
==============================================================================
--- z3/sqlos/trunk/ftesting.zcml	(original)
+++ z3/sqlos/trunk/ftesting.zcml	Mon Oct 17 13:29:07 2005
@@ -14,7 +14,8 @@
       permission="zope.Public"
       factory=".adapter.SQLiteAdapter"
       />
-  <!--
+
+  <!-- Adapters for testing against other databases:
       factory=".adapter.PostgresAdapter"
       factory=".adapter.MySQLAdapter"
   -->
@@ -25,6 +26,8 @@
       dsn='dbi://:memory:'
       />
 
+  <!-- Connections for testing against other databases:
+
   <rdb:provideConnection
       name='pgsql'
       component='psycopgda.adapter.PsycopgAdapter'
@@ -36,6 +39,7 @@
       component='mysqldbda.adapter.MySQLdbAdapter'
       dsn='dbi://testuser:testuser@localhost:3306/testdb'
       />
+  -->
 
   <sqlos:factory
       id="Dog"

Modified: z3/sqlos/trunk/interfaces/__init__.py
==============================================================================
--- z3/sqlos/trunk/interfaces/__init__.py	(original)
+++ z3/sqlos/trunk/interfaces/__init__.py	Mon Oct 17 13:29:07 2005
@@ -193,10 +193,12 @@
         setter methods on the class.
         """
 
-    def addColumnsFromDatabase():
-        """ Add to the class the columns that are defined on the
-        database but not already present.
-        """
+    # XXX this moved to sqlmeta in sqlobject 0.7, should we define another
+    # interface?
+    #def addColumnsFromDatabase():
+    #    """ Add to the class the columns that are defined on the
+    #    database but not already present.
+    #    """
 
     def delColumn(column, changeSchema=False):
         """ Delete the given column from the class. 'column' may be

Modified: z3/sqlos/trunk/metaconfigure.py
==============================================================================
--- z3/sqlos/trunk/metaconfigure.py	(original)
+++ z3/sqlos/trunk/metaconfigure.py	Mon Oct 17 13:29:07 2005
@@ -47,10 +47,7 @@
             permission=add_perm, name=id)
 
     if not IISQLObject.providedBy(component):
-        #Im sure that commenting Out that one, is not the correct
-        #sollution, but it doesnt work otherwise and it doesnt brake any
-        #test. Andres 2005-10-17
-        #if verifyClass(IISQLObject, component, tentative=1):
+        if verifyClass(IISQLObject, component, tentative=1):
             directlyProvides(component, IISQLObject)
 
     # XXX We are really creating a proxy for the *class* here.