[Sqlalchemy-commits] [1035] sqlalchemy/branches/sql_rearrangement/test: dev
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1035] sqlalchemy/branches/sql_rearrangement/test: dev
|
From: <co...@sq...> - 2006-02-25 06:55:53
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1035] sqlalchemy/branches/sql_rearrangement/test: dev</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1035</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-02-25 00:55:41 -0600 (Sat, 25 Feb 2006)</dd> </dl> <h3>Log Message</h3> <pre>dev</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchessql_rearrangementlibsqlalchemyschemapy">sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/schema.py</a></li> <li><a href="#sqlalchemybranchessql_rearrangementlibsqlalchemysqlpy">sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/sql.py</a></li> <li><a href="#sqlalchemybranchessql_rearrangementtestselectpy">sqlalchemy/branches/sql_rearrangement/test/select.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchessql_rearrangementlibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/schema.py (1034 => 1035)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/schema.py 2006-02-25 06:29:51 UTC (rev 1034) +++ sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/schema.py 2006-02-25 06:55:41 UTC (rev 1035) </span><span class="lines">@@ -493,7 +493,7 @@ </span><span class="cx"> raise NotImplementedError() </span><span class="cx"> </span><span class="cx"> class SchemaVisitor(sql.ClauseVisitor): </span><del>- """base class for an object that traverses across Schema structures.""" </del><ins>+ """defines the visiting for SchemaItem objects""" </ins><span class="cx"> def visit_schema(self, schema): </span><span class="cx"> """visit a generic SchemaItem""" </span><span class="cx"> pass </span></span></pre></div> <a id="sqlalchemybranchessql_rearrangementlibsqlalchemysqlpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/sql.py (1034 => 1035)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/sql.py 2006-02-25 06:29:51 UTC (rev 1034) +++ sqlalchemy/branches/sql_rearrangement/lib/sqlalchemy/sql.py 2006-02-25 06:55:41 UTC (rev 1035) </span><span class="lines">@@ -161,11 +161,13 @@ </span><span class="cx"> return Label(name, obj) </span><span class="cx"> </span><span class="cx"> def column(text, table=None, type=None): </span><del>- """returns a textual column clause, relative to a table. this differs from using straight text - or text() in that the column is treated like a regular column, i.e. gets added to a Selectable's list of columns.""" </del><ins>+ """returns a textual column clause, relative to a table. this is also the primitive version of + a schema.Column which is a subclass. """ </ins><span class="cx"> return ColumnClause(text, table, type) </span><span class="cx"> </span><span class="cx"> def table(name, *columns): </span><ins>+ """returns a table clause. this is a primitive version of the schema.Table object, which is a subclass + of this object.""" </ins><span class="cx"> return TableClause(name, *columns) </span><span class="cx"> </span><span class="cx"> def bindparam(key, value = None, type=None): </span><span class="lines">@@ -192,7 +194,7 @@ </span><span class="cx"> text - the text of the SQL statement to be created. use :<param> to specify </span><span class="cx"> bind parameters; they will be compiled to their engine-specific format. </span><span class="cx"> </span><del>- engine - the engine to be used for this text query. Alternatively, call the </del><ins>+ engine - an optional engine to be used for this text query. Alternatively, call the </ins><span class="cx"> text() method off the engine directly. </span><span class="cx"> </span><span class="cx"> bindparams - a list of bindparam() instances which can be used to define the </span><span class="lines">@@ -230,8 +232,7 @@ </span><span class="cx"> return isinstance(col, ColumnElement) </span><span class="cx"> </span><span class="cx"> class ClauseVisitor(object): </span><del>- """builds upon SchemaVisitor to define the visiting of SQL statement elements in - addition to Schema elements.""" </del><ins>+ """Defines the visiting of ClauseElements.""" </ins><span class="cx"> def visit_column(self, column):pass </span><span class="cx"> def visit_table(self, column):pass </span><span class="cx"> def visit_fromclause(self, fromclause):pass </span><span class="lines">@@ -348,6 +349,9 @@ </span><span class="cx"> return False </span><span class="cx"> </span><span class="cx"> def _find_engine(self): </span><ins>+ """default strategy for locating an engine within the clause element. + relies upon a local engine property, or looks in the "from" objects which + ultimately have to contain Tables or TableClauses. """ </ins><span class="cx"> try: </span><span class="cx"> if self._engine is not None: </span><span class="cx"> return self._engine </span><span class="lines">@@ -362,7 +366,7 @@ </span><span class="cx"> else: </span><span class="cx"> return None </span><span class="cx"> </span><del>- engine = property(lambda s: s._find_engine()) </del><ins>+ engine = property(lambda s: s._find_engine(), doc="attempts to locate a SQLEngine within this ClauseElement structure, or returns None if none found.") </ins><span class="cx"> </span><span class="cx"> def compile(self, engine = None, parameters = None, typemap=None): </span><span class="cx"> """compiles this SQL expression using its underlying SQLEngine to produce </span><span class="lines">@@ -373,16 +377,13 @@ </span><span class="cx"> engine = self.engine </span><span class="cx"> </span><span class="cx"> if engine is None: </span><del>- raise InvalidRequestError("no SQLEngine could be located within this ClauseElement.") </del><ins>+ import sqlalchemy.ansisql as ansisql + engine = ansisql.engine() </ins><span class="cx"> </span><span class="cx"> return engine.compile(self, parameters=parameters, typemap=typemap) </span><span class="cx"> </span><span class="cx"> def __str__(self): </span><del>- e = self.engine - if e is None: - import sqlalchemy.ansisql as ansisql - e = ansisql.engine() - return str(self.compile(e)) </del><ins>+ return str(self.compile()) </ins><span class="cx"> </span><span class="cx"> def execute(self, *multiparams, **params): </span><span class="cx"> """compiles and executes this SQL expression using its underlying SQLEngine. the </span><span class="lines">@@ -418,6 +419,7 @@ </span><span class="cx"> return not_(self) </span><span class="cx"> </span><span class="cx"> class CompareMixin(object): </span><ins>+ """defines comparison operations for ClauseElements.""" </ins><span class="cx"> def __lt__(self, other): </span><span class="cx"> return self._compare('<', other) </span><span class="cx"> def __le__(self, other): </span><span class="lines">@@ -493,19 +495,15 @@ </span><span class="cx"> </span><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> raise NotImplementedError(repr(self)) </span><del>- </del><span class="cx"> def is_selectable(self): </span><span class="cx"> return True </span><del>- </del><span class="cx"> def select(self, whereclauses = None, **params): </span><span class="cx"> return select([self], whereclauses, **params) </span><del>- </del><span class="cx"> def _group_parenthesized(self): </span><span class="cx"> """indicates if this Selectable requires parenthesis when grouped into a compound </span><span class="cx"> statement""" </span><span class="cx"> return True </span><span class="cx"> </span><del>- </del><span class="cx"> class ColumnElement(Selectable, CompareMixin): </span><span class="cx"> """represents a column element within the list of a Selectable's columns. Provides </span><span class="cx"> default implementations for the things a "column" needs, including a "primary_key" flag, </span><span class="lines">@@ -856,13 +854,9 @@ </span><span class="cx"> return and_(*crit) </span><span class="cx"> </span><span class="cx"> def _group_parenthesized(self): </span><del>- """indicates if this Selectable requires parenthesis when grouped into a compound - statement""" </del><span class="cx"> return True </span><del>- </del><span class="cx"> def select(self, whereclauses = None, **params): </span><span class="cx"> return select([self.left, self.right], whereclauses, from_obj=[self], **params) </span><del>- </del><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> self.left.accept_visitor(visitor) </span><span class="cx"> self.right.accept_visitor(visitor) </span><span class="lines">@@ -948,9 +942,8 @@ </span><span class="cx"> return self.obj._make_proxy(selectable, name=self.name) </span><span class="cx"> </span><span class="cx"> class ColumnClause(ColumnElement): </span><del>- """represents a textual column clause in a SQL statement. ColumnClause operates - in two modes, one where its just any text that will be placed into the select statement, - and "column" mode, where it represents a column attached to a table.""" </del><ins>+ """represents a textual column clause in a SQL statement. May or may not + be bound to an underlying Selectable.""" </ins><span class="cx"> def __init__(self, text, selectable=None, type=None): </span><span class="cx"> self.key = self.name = self.text = text </span><span class="cx"> self.table = selectable </span><span class="lines">@@ -961,7 +954,6 @@ </span><span class="cx"> else: </span><span class="cx"> return self.text </span><span class="cx"> _label = property(_get_label) </span><del>- default_label = property(lambda s:s._label) </del><span class="cx"> def accept_visitor(self, visitor): </span><span class="cx"> visitor.visit_column(self) </span><span class="cx"> def _get_from_objects(self): </span></span></pre></div> <a id="sqlalchemybranchessql_rearrangementtestselectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/sql_rearrangement/test/select.py (1034 => 1035)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/sql_rearrangement/test/select.py 2006-02-25 06:29:51 UTC (rev 1034) +++ sqlalchemy/branches/sql_rearrangement/test/select.py 2006-02-25 06:55:41 UTC (rev 1035) </span><span class="lines">@@ -10,6 +10,10 @@ </span><span class="cx"> from testbase import PersistTest </span><span class="cx"> import unittest, re </span><span class="cx"> </span><ins>+# the select test now tests almost completely with TableClause/ColumnClause objects, +# which are free-roaming table/column objects not attached to any database. +# so SQLAlchemy's SQL construction engine can be used with no database dependencies at all. + </ins><span class="cx"> table1 = table('mytable', </span><span class="cx"> column('myid'), </span><span class="cx"> column('name'), </span></span></pre> </div> </div> </body> </html> |
