[Sqlalchemy-commits] [1294] sqlalchemy/branches/schema/doc/build: dev
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1294] sqlalchemy/branches/schema/doc/build: dev
|
From: <co...@sq...> - 2006-04-19 03:58:15
|
<!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>[1294] sqlalchemy/branches/schema/doc/build: dev</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1294</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-18 22:58:05 -0500 (Tue, 18 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>dev</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcontentdocument_basemyt">sqlalchemy/branches/schema/doc/build/content/document_base.myt</a></li> <li><a href="#sqlalchemybranchesschemadocbuildcontenttutorialtxt">sqlalchemy/branches/schema/doc/build/content/tutorial.txt</a></li> <li><a href="#sqlalchemybranchesschemadocbuildtestdocspy">sqlalchemy/branches/schema/doc/build/testdocs.py</a></li> <li><a href="#sqlalchemybranchesschemadocbuildtxt2mytpy">sqlalchemy/branches/schema/doc/build/txt2myt.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemadocbuildcontentdocument_basemyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/document_base.myt (1293 => 1294)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/document_base.myt 2006-04-19 02:26:23 UTC (rev 1293) +++ sqlalchemy/branches/schema/doc/build/content/document_base.myt 2006-04-19 03:58:05 UTC (rev 1294) </span><span class="lines">@@ -3,7 +3,7 @@ </span><span class="cx"> <%python scope="global"> </span><span class="cx"> </span><span class="cx"> files = [ </span><del>- #'tutorial', </del><ins>+ 'tutorial', </ins><span class="cx"> 'trailmap', </span><span class="cx"> 'pooling', </span><span class="cx"> 'dbengine', </span><span class="lines">@@ -24,7 +24,7 @@ </span><span class="cx"> onepage='documentation' </span><span class="cx"> index='index' </span><span class="cx"> title='SQLAlchemy Documentation' </span><del>- version = '0.1.5' </del><ins>+ version = '0.2.0' </ins><span class="cx"> </%attr> </span><span class="cx"> </span><span class="cx"> <%method title> </span></span></pre></div> <a id="sqlalchemybranchesschemadocbuildcontenttutorialtxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/tutorial.txt (1293 => 1294)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/tutorial.txt 2006-04-19 02:26:23 UTC (rev 1293) +++ sqlalchemy/branches/schema/doc/build/content/tutorial.txt 2006-04-19 03:58:05 UTC (rev 1294) </span><span class="lines">@@ -90,7 +90,7 @@ </span><span class="cx"> </span><span class="cx"> Alternatively, the `users` table might already exist (such as, if you're running examples from this tutorial for the second time), in which case you can just skip the `create()` method call. You can even skip defining the individual columns in the `users` table and ask SQLAlchemy to load its definition from the database: </span><span class="cx"> </span><del>- >>> users = Table('users', db, autoload = True) </del><ins>+ >>> users = Table('users', metadata, autoload=True) </ins><span class="cx"> >>> list(users.columns)[0].name </span><span class="cx"> 'user_id' </span><span class="cx"> </span><span class="lines">@@ -110,10 +110,10 @@ </span><span class="cx"> </span><span class="cx"> >>> for name in ['Tom', 'Dick', 'Harry']: # doctest:+ELLIPSIS </span><span class="cx"> ... i.execute(user_name = name) </span><del>- <sqlalchemy.engine.ResultProxy instance at 0x...> </del><ins>+ <sqlalchemy.engine.base.ResultProxy instance at 0x...> </ins><span class="cx"> ... </span><span class="cx"> >>> i.execute(user_name = 'Mary', password = 'secure') # doctest:+ELLIPSIS </span><del>- <sqlalchemy.engine.ResultProxy instance at 0x...> </del><ins>+ <sqlalchemy.engine.base.ResultProxy instance at 0x...> </ins><span class="cx"> </span><span class="cx"> When constructing clause objects, SQLAlchemy will bind all literal values into bind parameters, according to the paramstyle of the underlying DBAPI. This allows for better performance, as the database may cache a compiled representation of the statement and reuse it for new executions, substituting the new values. Also, when using bound values, you need not worry about [SQL injection][] attacks. </span><span class="cx"> </span><span class="lines">@@ -134,7 +134,7 @@ </span><span class="cx"> This time, we won't ignore the return value of `execute()`: </span><span class="cx"> </span><span class="cx"> >>> r # doctest:+ELLIPSIS </span><del>- <sqlalchemy.engine.ResultProxy instance at 0x...> </del><ins>+ <sqlalchemy.engine.base.ResultProxy instance at 0x...> </ins><span class="cx"> >>> r.keys </span><span class="cx"> ['user_id', 'user_name', 'password'] </span><span class="cx"> >>> row = r.fetchone() </span></span></pre></div> <a id="sqlalchemybranchesschemadocbuildtestdocspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/testdocs.py (1293 => 1294)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/testdocs.py 2006-04-19 02:26:23 UTC (rev 1293) +++ sqlalchemy/branches/schema/doc/build/testdocs.py 2006-04-19 03:58:05 UTC (rev 1294) </span><span class="lines">@@ -1,7 +1,19 @@ </span><ins>+import sys +sys.path = ['../../lib', './lib/'] + sys.path + </ins><span class="cx"> import os </span><span class="cx"> import re </span><span class="cx"> import doctest </span><ins>+import sqlalchemy.util as util </ins><span class="cx"> </span><ins>+# monkeypatch a plain logger +class Logger(object): + def __init__(self, *args, **kwargs): + pass + def write(self, msg): + print msg +util.Logger = Logger + </ins><span class="cx"> def teststring(s, name, globs=None, verbose=None, report=True, </span><span class="cx"> optionflags=0, extraglobs=None, raise_on_error=False, </span><span class="cx"> parser=doctest.DocTestParser()): </span><span class="lines">@@ -37,7 +49,7 @@ </span><span class="cx"> def replace_file(s, oldfile, newfile): </span><span class="cx"> engine = r"sqlite:///" + oldfile </span><span class="cx"> engine = re.compile(engine, re.MULTILINE) </span><del>- s, n = re.subn(engine, "sqlite:///" + newfile, s, 1) </del><ins>+ s, n = re.subn(engine, "sqlite:///" + newfile, s) </ins><span class="cx"> if not n: </span><span class="cx"> raise ValueError("Couldn't find suitable create_engine call to replace '%s' in it" % oldfile) </span><span class="cx"> return s </span></span></pre></div> <a id="sqlalchemybranchesschemadocbuildtxt2mytpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/txt2myt.py (1293 => 1294)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/txt2myt.py 2006-04-19 02:26:23 UTC (rev 1293) +++ sqlalchemy/branches/schema/doc/build/txt2myt.py 2006-04-19 03:58:05 UTC (rev 1294) </span><span class="lines">@@ -274,6 +274,6 @@ </span><span class="cx"> print inname, '->', outname </span><span class="cx"> input = file(inname).read() </span><span class="cx"> html = markdown.markdown(input) </span><del>- file(inname[:-3] + "html", 'w').write(html) </del><ins>+ #file(inname[:-3] + "html", 'w').write(html) </ins><span class="cx"> myt = html2myghtydoc(html) </span><span class="cx"> file(outname, 'w').write(myt) </span></span></pre> </div> </div> </body> </html> |
