[Sqlalchemy-commits] [1517] sqlalchemy/trunk/test: converted sqlsoup, got its doctests working (were
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1517] sqlalchemy/trunk/test: converted sqlsoup, got its doctests working (werent working in 0.1 either....), added doctest hook to testsuite
|
From: <co...@sq...> - 2006-05-27 01:20:12
|
<!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>[1517] sqlalchemy/trunk/test: converted sqlsoup, got its doctests working (werent working in 0.1 either....), added doctest hook to testsuite</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1517</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-26 20:19:56 -0500 (Fri, 26 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>converted sqlsoup, got its doctests working (werent working in 0.1 either....), added doctest hook to testsuite fix to selectone_by/selectone when zero rows returned</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyextsqlsouppy">sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemyormquerypy">sqlalchemy/trunk/lib/sqlalchemy/orm/query.py</a></li> <li><a href="#sqlalchemytrunktestalltestspy">sqlalchemy/trunk/test/alltests.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemytrunktestsqlsouppy">sqlalchemy/trunk/test/sqlsoup.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyextsqlsouppy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py (1516 => 1517)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py 2006-05-27 00:16:45 UTC (rev 1516) +++ sqlalchemy/trunk/lib/sqlalchemy/ext/sqlsoup.py 2006-05-27 01:19:56 UTC (rev 1517) </span><span class="lines">@@ -1,5 +1,3 @@ </span><del>-from sqlalchemy import * - </del><span class="cx"> """ </span><span class="cx"> SqlSoup provides a convenient way to access database tables without having </span><span class="cx"> to declare table or mapper classes ahead of time. </span><span class="lines">@@ -9,16 +7,16 @@ </span><span class="cx"> For testing purposes, we can create this db as follows: </span><span class="cx"> </span><span class="cx"> >>> from sqlalchemy import create_engine </span><del>->>> e = create_engine('sqlite://filename=:memory:') ->>> for sql in _testsql: e.execute(sql) -... </del><ins>+>>> e = create_engine('sqlite:///:memory:') +>>> for sql in _testsql: e.execute(sql) #doctest: +ELLIPSIS +<... </ins><span class="cx"> </span><span class="cx"> Creating a SqlSoup gateway is just like creating an SqlAlchemy engine: </span><span class="cx"> >>> from sqlalchemy.ext.sqlsoup import SqlSoup </span><del>->>> soup = SqlSoup('sqlite://filename=:memory:') </del><ins>+>>> soup = SqlSoup('sqlite:///:memory:') </ins><span class="cx"> </span><del>-or, you can re-use an existing engine: ->>> soup = SqlSoup(e) </del><ins>+or, you can re-use an existing metadata: +>>> soup = SqlSoup(BoundMetaData(e)) </ins><span class="cx"> </span><span class="cx"> Loading objects is as easy as this: </span><span class="cx"> >>> users = soup.users.select() </span><span class="lines">@@ -28,8 +26,7 @@ </span><span class="cx"> </span><span class="cx"> Of course, letting the database do the sort is better (".c" is short for ".columns"): </span><span class="cx"> >>> soup.users.select(order_by=[soup.users.c.name]) </span><del>-[Class_Users(name='Bhargan Basepair',email='bas...@ex...',password='basepair',classname=None,admin=1), - Class_Users(name='Joe Student',email='st...@ex...',password='student',classname=None,admin=0)] </del><ins>+[Class_Users(name='Bhargan Basepair',email='bas...@ex...',password='basepair',classname=None,admin=1), Class_Users(name='Joe Student',email='st...@ex...',password='student',classname=None,admin=0)] </ins><span class="cx"> </span><span class="cx"> Field access is intuitive: </span><span class="cx"> >>> users[0].email </span><span class="lines">@@ -47,22 +44,28 @@ </span><span class="cx"> Modifying objects is intuitive: </span><span class="cx"> >>> user = _ </span><span class="cx"> >>> user.email = 'bas...@ex...' </span><del>->>> soup.commit() </del><ins>+>>> soup.flush() </ins><span class="cx"> </span><span class="cx"> (SqlSoup leverages the sophisticated SqlAlchemy unit-of-work code, so </span><span class="cx"> multiple updates to a single object will be turned into a single UPDATE </span><del>-statement when you commit.) </del><ins>+statement when you flush.) </ins><span class="cx"> </span><span class="cx"> Finally, insert and delete. Let's insert a new loan, then delete it: </span><del>->>> soup.loans.insert(book_id=soup.books.selectfirst().id, user_name=user.name) -Class_Loans(book_id=1,user_name='Bhargan Basepair',loan_date=None) ->>> soup.commit() </del><ins>+>>> soup.loans.insert(book_id=soup.books.selectfirst(soup.books.c.title=='Regional Variation in Moss').id, user_name=user.name) +Class_Loans(book_id=2,user_name='Bhargan Basepair',loan_date=None) +>>> soup.flush() </ins><span class="cx"> </span><del>->>> loan = soup.loans.selectone_by(book_id=1, user_name='Bhargan Basepair') </del><ins>+>>> loan = soup.loans.selectone_by(book_id=2, user_name='Bhargan Basepair') </ins><span class="cx"> >>> soup.delete(loan) </span><del>->>> soup.commit() </del><ins>+>>> soup.flush() </ins><span class="cx"> """ </span><span class="cx"> </span><ins>+from sqlalchemy import * +from sqlalchemy.ext.sessioncontext import SessionContext +from sqlalchemy.ext.assignmapper import assign_mapper +from sqlalchemy.exceptions import * + + </ins><span class="cx"> _testsql = """ </span><span class="cx"> CREATE TABLE books ( </span><span class="cx"> id integer PRIMARY KEY, -- auto-SERIAL in sqlite </span><span class="lines">@@ -83,7 +86,7 @@ </span><span class="cx"> book_id int PRIMARY KEY REFERENCES books(id), </span><span class="cx"> user_name varchar(32) references users(name) </span><span class="cx"> ON DELETE SET NULL ON UPDATE CASCADE, </span><del>- loan_date date NOT NULL DEFAULT current_timestamp </del><ins>+ loan_date date DEFAULT current_timestamp </ins><span class="cx"> ); </span><span class="cx"> </span><span class="cx"> insert into users(name, email, password, admin) </span><span class="lines">@@ -105,6 +108,17 @@ </span><span class="cx"> </span><span class="cx"> __all__ = ['NoSuchTableError', 'SqlSoup'] </span><span class="cx"> </span><ins>+# +# thread local SessionContext +# +class Objectstore(SessionContext): + def __getattr__(self, key): + return getattr(self.current, key) + def get_session(self): + return self.current + +objectstore = Objectstore(create_session) + </ins><span class="cx"> class NoSuchTableError(SQLAlchemyError): pass </span><span class="cx"> </span><span class="cx"> # metaclass is necessary to expose class methods with getattr, e.g. </span><span class="lines">@@ -133,7 +147,7 @@ </span><span class="cx"> L.append("%s=%r" % (k, value)) </span><span class="cx"> return '%s(%s)' % (self.__class__.__name__, ','.join(L)) </span><span class="cx"> klass.__repr__ = __repr__ </span><del>- klass._mapper = mapper(klass, table) </del><ins>+ klass._mapper = mapper(klass, table, extension=objectstore.mapper_extension) </ins><span class="cx"> return klass </span><span class="cx"> </span><span class="cx"> class SqlSoup: </span><span class="lines">@@ -142,21 +156,21 @@ </span><span class="cx"> args may either be an SQLEngine or a set of arguments suitable </span><span class="cx"> for passing to create_engine </span><span class="cx"> """ </span><del>- from sqlalchemy.engine import SQLEngine </del><ins>+ from sqlalchemy import MetaData </ins><span class="cx"> # meh, sometimes having method overloading instead of kwargs would be easier </span><del>- if isinstance(args[0], SQLEngine): </del><ins>+ if isinstance(args[0], MetaData): </ins><span class="cx"> args = list(args) </span><del>- engine = args.pop(0) </del><ins>+ metadata = args.pop(0) </ins><span class="cx"> if args or kwargs: </span><del>- raise ArgumentError('Extra arguments not allowed when engine is given') </del><ins>+ raise ArgumentError('Extra arguments not allowed when metadata is given') </ins><span class="cx"> else: </span><del>- engine = create_engine(*args, **kwargs) - self._engine = engine </del><ins>+ metadata = BoundMetaData(*args, **kwargs) + self._metadata = metadata </ins><span class="cx"> self._cache = {} </span><span class="cx"> def delete(self, *args, **kwargs): </span><span class="cx"> objectstore.delete(*args, **kwargs) </span><del>- def commit(self): - objectstore.get_session().commit() </del><ins>+ def flush(self): + objectstore.get_session().flush() </ins><span class="cx"> def rollback(self): </span><span class="cx"> objectstore.clear() </span><span class="cx"> def _reset(self): </span><span class="lines">@@ -167,7 +181,7 @@ </span><span class="cx"> try: </span><span class="cx"> t = self._cache[attr] </span><span class="cx"> except KeyError: </span><del>- table = Table(attr, self._engine, autoload=True) </del><ins>+ table = Table(attr, self._metadata, autoload=True) </ins><span class="cx"> if table.columns: </span><span class="cx"> t = class_for_table(table) </span><span class="cx"> else: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemyormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/query.py (1516 => 1517)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2006-05-27 00:16:45 UTC (rev 1516) +++ sqlalchemy/trunk/lib/sqlalchemy/orm/query.py 2006-05-27 01:19:56 UTC (rev 1517) </span><span class="lines">@@ -169,7 +169,10 @@ </span><span class="cx"> ret = self.select_whereclause(self.join_by(*args, **params), limit=2) </span><span class="cx"> if len(ret) == 1: </span><span class="cx"> return ret[0] </span><del>- raise exceptions.InvalidRequestError('Multiple rows returned for selectone_by') </del><ins>+ elif len(ret) == 0: + raise exceptions.InvalidRequestError('No rows returned for selectone_by') + else: + raise exceptions.InvalidRequestError('Multiple rows returned for selectone_by') </ins><span class="cx"> </span><span class="cx"> def count_by(self, *args, **params): </span><span class="cx"> """returns the count of instances based on the given clauses and key/value criterion. </span><span class="lines">@@ -191,7 +194,10 @@ </span><span class="cx"> ret = list(self.select(*args, **params)[0:2]) </span><span class="cx"> if len(ret) == 1: </span><span class="cx"> return ret[0] </span><del>- raise exceptions.InvalidRequestError('Multiple rows returned for selectone') </del><ins>+ elif len(ret) == 0: + raise exceptions.InvalidRequestError('No rows returned for selectone_by') + else: + raise exceptions.InvalidRequestError('Multiple rows returned for selectone') </ins><span class="cx"> </span><span class="cx"> def select(self, arg=None, **kwargs): </span><span class="cx"> """selects instances of the object from the database. </span></span></pre></div> <a id="sqlalchemytrunktestalltestspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/alltests.py (1516 => 1517)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/alltests.py 2006-05-27 00:16:45 UTC (rev 1516) +++ sqlalchemy/trunk/test/alltests.py 2006-05-27 01:19:56 UTC (rev 1517) </span><span class="lines">@@ -53,7 +53,9 @@ </span><span class="cx"> </span><span class="cx"> # extensions </span><span class="cx"> 'proxy_engine', </span><del>- 'activemapper' </del><ins>+ 'activemapper', + 'sqlsoup' + </ins><span class="cx"> #'wsgi_test', </span><span class="cx"> </span><span class="cx"> ) </span></span></pre></div> <a id="sqlalchemytrunktestsqlsouppy"></a> <div class="addfile"><h4>Added: sqlalchemy/trunk/test/sqlsoup.py (1516 => 1517)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/sqlsoup.py 2006-05-27 00:16:45 UTC (rev 1516) +++ sqlalchemy/trunk/test/sqlsoup.py 2006-05-27 01:19:56 UTC (rev 1517) </span><span class="lines">@@ -0,0 +1,19 @@ </span><ins>+import testbase + +import sqlalchemy.ext.sqlsoup as sqlsoup + +class SqlSoupTest(testbase.AssertMixin): + def tearDown(self): + pass + def tearDownAll(self): + pass + def setUpAll(self): + pass + def setUp(self): + pass + def testall(self): + import doctest + doctest.testmod(m=sqlsoup,verbose=True) + +if __name__ == "__main__": + testbase.main() </ins></span></pre> </div> </div> </body> </html> |
