From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 4 Dec 2005 00:30:44 +0000 (+0000)
Subject: dev
X-Git-Tag: rel_0_1_0~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4629f79c4ad0496eb2d6454ea98a24fab150c360;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

dev
---

diff --git a/doc/build/content/adv_datamapping.myt b/doc/build/content/adv_datamapping.myt
index 31da6f7716..306da3f818 100644
--- a/doc/build/content/adv_datamapping.myt
+++ b/doc/build/content/adv_datamapping.myt
@@ -118,6 +118,7 @@
     <&|doclib.myt:item, name="relationoptions", description="Relation Options" &>
     Keyword options to the <span class="codeline">relation</span> function include:
     <ul>
+        <li>lazy=(True|False|None) - specifies how the related items should be loaded.  a value of True indicates they should be loaded when the property is first accessed.  A value of False indicates they should be loaded by joining against the parent object query, so parent and child are loaded in one round trip.  A value of None indicates the related items are not loaded by the mapper in any case; the application will manually insert items into the list in some other way.  A relationship with lazy=None is still important; items added to the list or removed will cause the appropriate updates and deletes upon commit().</li>
         <li>primaryjoin - a ClauseElement that will be used as the primary join of this child object against the parent object, or in a many-to-many relationship the join of the primary object to the association table.  By default, this value is computed based on the foreign key relationships of the parent and child tables (or association table).</li>
         <li>secondaryjoin - a ClauseElement that will be used as the join of an association table to the child object.  By default, this value is computed based on the foreign key relationships of the association and child tables.</li>
         <li>foreignkey - specifies which column in this relationship is "foreign", i.e. which column refers to the parent object.  This value is automatically determined in all cases, based on the primary and secondary join conditions, except in the case of a self-referential mapper, where it is needed to indicate the child object's reference back to it's parent.</li>
diff --git a/doc/build/content/dbengine.myt b/doc/build/content/dbengine.myt
index 2af9fb25b4..bec3651668 100644
--- a/doc/build/content/dbengine.myt
+++ b/doc/build/content/dbengine.myt
@@ -11,12 +11,12 @@
     </p>
     <&|doclib.myt:item, name="establishing", description="Establishing a Database Engine" &>
     <p>
-    Engines exist for SQLite, Postgres, and Oracle, using the Pysqlite, Psycopg (1 or 2), and cx_Oracle modules.  Each engine imports its corresponding module which is required to be installed.  For Postgres and Oracle, an alternate module may be specified at construction time as well.
+    Engines exist for SQLite, Postgres, MySQL, and Oracle, using the Pysqlite, Psycopg (1 or 2), MySQLDB, and cx_Oracle modules.  Each engine imports its corresponding module which is required to be installed.  For Postgres and Oracle, an alternate module may be specified at construction time as well.
     </p>
     <p>An example of connecting to each engine is as follows:</p>
     
     <&|formatting.myt:code&>
-    from sqlalchemy.engine import *
+    from sqlalchemy import *
 
     # sqlite in memory    
     sqlite_engine = create_engine('sqlite', {'filename':':memory:'}, **opts)