[Checkins]
SVN: z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/
- fixed tests
Andreas Jung
andreas at andreas-jung.com
Sat May 10 05:08:59 EDT 2008
Log message for revision 86609:
- fixed tests
- more tests
- fixed deprecation warnings
Changed:
U z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/tests/testSQLAlchemy.py
U z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/util.py
-=-
Modified: z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/tests/testSQLAlchemy.py
===================================================================
--- z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/tests/testSQLAlchemy.py 2008-05-10 06:43:24 UTC (rev 86608)
+++ z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/tests/testSQLAlchemy.py 2008-05-10 09:08:58 UTC (rev 86609)
@@ -37,14 +37,14 @@
metadata = MetaData(bind=wrapper.engine)
users = Table('users', metadata,
- Column('user_id', Integer, primary_key=True),
- Column('firstname', String),
- Column('lastname', String))
+ Column('id', Integer, primary_key=True),
+ Column('firstname', String(255)),
+ Column('lastname', String(255)))
skill = Table('skills', metadata,
Column('user_id', Integer, primary_key=True),
Column('user_id', Integer),
- Column('name', String))
+ Column('name', String(255)))
metadata.create_all()
@@ -68,7 +68,7 @@
session.save(User(id=1, firstname='udo', lastname='juergens'))
session.save(User(id=2, firstname='heino', lastname='n/a'))
session.flush()
-
+
rows = session.query(User).order_by(User.c.id).all()
self.assertEqual(len(rows), 2)
row1 = rows[0]
@@ -164,13 +164,7 @@
User = db.getMapper('users')
session = db.session
session.save(User(id=1,firstname='foo', lastname='bar'))
-
- try:
- session.flush()
- except:
- import traceback; traceback.print_exc()
- import pdb; pdb.set_trace()
-
+ session.flush()
user = session.query(User).filter_by(firstname='foo')[0]
Skill = user.getMapper('skills')
user.skills.append(Skill(id=1, name='Zope'))
@@ -185,6 +179,23 @@
rows = cursor.fetchall()
self.assertEqual(len(rows), 0)
+ def testConnectionPlusSession(self):
+ """ Check access to low-level connection """
+ db = createSAWrapper(self.dsn)
+
+ User = db.getMapper('users')
+ session = db.session
+ session.save(User(id=1, firstname='udo', lastname='juergens'))
+ session.save(User(id=2, firstname='heino', lastname='n/a'))
+ session.flush()
+
+ conn = db.connection
+ cursor = conn.cursor()
+ cursor.execute('select * from users')
+ rows = cursor.fetchall()
+ self.assertEqual(len(rows), 2)
+
+
def test_suite():
from unittest import TestSuite, makeSuite
suite = TestSuite()
Modified: z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/util.py
===================================================================
--- z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/util.py 2008-05-10 06:43:24 UTC (rev 86608)
+++ z3c.sqlalchemy/branches/zope.sqlalchemy-integration/src/z3c/sqlalchemy/util.py 2008-05-10 09:08:58 UTC (rev 86609)
@@ -14,10 +14,8 @@
from sqlalchemy.engine.url import make_url
-from zope.component import getService, getGlobalServices, getUtilitiesFor, getUtility
-from zope.component.utility import GlobalUtilityService
+from zope.component import getUtilitiesFor, getUtility
from zope.component.interfaces import IUtilityService, ComponentLookupError
-from zope.component.servicenames import Utilities
from z3c.sqlalchemy.interfaces import ISQLAlchemyWrapper
from z3c.sqlalchemy.postgres import ZopePostgresWrapper
More information about the Checkins
mailing list