diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-06 21:11:27 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-08-06 21:11:27 +0000 |
| commit | 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca (patch) | |
| tree | ae9e27d12c9fbf8297bb90469509e1cb6a206242 /examples | |
| parent | 7638aa7f242c6ea3d743aa9100e32be2052546a6 (diff) | |
| download | sqlalchemy-8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca.tar.gz | |
merge 0.6 series to trunk.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/postgis/postgis.py | 2 | ||||
| -rw-r--r-- | examples/query_caching/query_caching.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/postgis/postgis.py b/examples/postgis/postgis.py index c482d8256..8e687d7f8 100644 --- a/examples/postgis/postgis.py +++ b/examples/postgis/postgis.py @@ -231,7 +231,7 @@ if __name__ == '__main__': from sqlalchemy.orm import sessionmaker, column_property from sqlalchemy.ext.declarative import declarative_base - engine = create_engine('postgres://scott:tiger@localhost/gistest', echo=True) + engine = create_engine('postgresql://scott:tiger@localhost/gistest', echo=True) metadata = MetaData(engine) Base = declarative_base(metadata=metadata) diff --git a/examples/query_caching/query_caching.py b/examples/query_caching/query_caching.py index 92d48e2d7..00a4cc3ec 100644 --- a/examples/query_caching/query_caching.py +++ b/examples/query_caching/query_caching.py @@ -27,7 +27,7 @@ class CachingQuery(Query): self.session.expunge(x) _cache[self.cachekey] = ret - return iter(self.session.merge(x, dont_load=True) for x in ret) + return iter(self.session.merge(x, load=False) for x in ret) else: return Query.__iter__(self) |