[SQL-CVS] r4316 - SQLObject/trunk/docs

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

Author: phd
Date: Fri Dec 24 08:55:02 2010
New Revision: 4316

Log:
Some objects must be strings, some only SQLExpression's.

Modified:
   SQLObject/trunk/docs/SQLBuilder.txt

Modified: SQLObject/trunk/docs/SQLBuilder.txt
==============================================================================
--- SQLObject/trunk/docs/SQLBuilder.txt	Fri Dec 24 05:58:41 2010	(r4315)
+++ SQLObject/trunk/docs/SQLBuilder.txt	Fri Dec 24 08:55:02 2010	(r4316)
@@ -97,25 +97,24 @@
 parameters except `items` are optional.
 
 `items`:
-   A string, an SQLExpression or a sequence of strings or
-   SQLExpression's, represents the list of columns. If there are
-   SQLExpression's Select derives a list of tables for SELECT query.
+   An SQLExpression or a sequence of SQLExpression's, represents the
+   list of columns. If there are q-values SQLExpression's Select derives
+   a list of tables for SELECT query.
 
 `where`:
-   A string or an SQLExpression, represents the WHERE clause.
+   An SQLExpression, represents the WHERE clause.
 
 `groupBy`:
-   A string or an SQLExpression, represents the GROUP BY clause.
+   An SQLExpression, represents the GROUP BY clause.
 
 `having`:
-   A string or an SQLExpression, represents the HAVING part of the GROUP
-   BY clause.
+   An SQLExpression, represents the HAVING part of the GROUP BY clause.
 
 `orderBy`:
-   A string or an SQLExpression, represents the ORDER BY clause.
+   An SQLExpression, represents the ORDER BY clause.
 
 `limit`:
-   A string or an SQLExpression, represents the LIMIT clause.
+   An SQLExpression, represents the LIMIT clause.
 
 `join`:
    A (list of) JOINs (LEFT JOIN, etc.)
@@ -187,7 +186,7 @@
    A dictionary {key: value}; keys are column names. Required.
 
 `where`:
-   An optional string or an SQLExpression, represents the WHERE clause.
+   An optional SQLExpression, represents the WHERE clause.
 
 Example::
 
@@ -207,9 +206,9 @@
    A string that names the table to UPDATE. Required.
 
 `where`:
-   A string or an SQLExpression, represents the WHERE clause. Required.
-   If you need to delete all rows pass ``where=None``; this is a safety
-   measure.
+   An optional string or an SQLExpression, represents the WHERE clause.
+   Required. If you need to delete all rows pass ``where=None``; this is
+   a safety measure.
 
 Example::