Changeset 3450

Show
Ignore:
Timestamp:
04/14/10 16:38:02 (3 years ago)
Author:
tsauerwein
Message:

moved Base class for declarative mappings into model/meta.py

Location:
sandbox/tsauerwein/sample/mapfishsample
Files:
9 modified

Legend:

Unmodified
Added
Removed

  • sandbox/tsauerwein/sample/mapfishsample/model/cities.py

    r3440 r3450  
    1818# 
    1919 
    20  
    21 from sqlalchemy.ext.declarative import declarative_base 
    22  
    2320from geoalchemy import GeometryColumn, Geometry 
    2421 
    2522from mapfish.sqlalchemygeom import GeometryTableMixIn 
    26 from mapfishsample.model.meta import metadata, engine 
     23from mapfishsample.model.meta import engine, Base 
    2724 
    28  
    29 Base = declarative_base(metadata=metadata) 
    3025 
    3126class City(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/model/countries.py

    r3440 r3450  
    1818# 
    1919 
    20 from sqlalchemy.ext.declarative import declarative_base 
    2120from sqlalchemy import types, Column 
    2221 
    … …  
    2423 
    2524from mapfish.sqlalchemygeom import GeometryTableMixIn 
    26 from mapfishsample.model.meta import metadata, engine 
     25from mapfishsample.model.meta import engine, Base 
    2726 
    28  
    29 Base = declarative_base(metadata=metadata) 
    3027 
    3128class Country(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/model/epfl.py

    r3440 r3450  
    1818# 
    1919 
    20  
    21 from sqlalchemy.ext.declarative import declarative_base 
    22  
    23 from geoalchemy import GeometryColumn, Geometry, 
     20from geoalchemy import GeometryColumn, Geometry 
    2421 
    2522from mapfish.sqlalchemygeom import GeometryTableMixIn 
    26 from mapfishsample.model.meta import metadata, engine 
     23from mapfishsample.model.meta import engine, Base 
    2724 
    28  
    29 Base = declarative_base(metadata=metadata) 
    3025 
    3126class Node(Base, GeometryTableMixIn): 
    … …  
    4540 
    4641 
    47 class Line(Base): 
     42class Line(Base, GeometryTableMixIn): 
    4843    __tablename__ = 'lines2' 
    4944    __table_args__ = { 

  • sandbox/tsauerwein/sample/mapfishsample/model/lines.py

    r3440 r3450  
    1818# 
    1919 
    20  
    2120from sqlalchemy import Column, types 
    22 from sqlalchemy.ext.declarative import declarative_base 
    2321 
    2422from geoalchemy import GeometryColumn, LineString, GeometryDDL 
    2523 
    2624from mapfish.sqlalchemygeom import GeometryTableMixIn 
    27 from mapfishsample.model.meta import metadata 
     25from mapfishsample.model.meta import Base 
    2826 
    29  
    30 Base = declarative_base(metadata=metadata) 
    3127 
    3228class Line(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/model/meta.py

    r1590 r3450  
    22from sqlalchemy import MetaData 
    33from sqlalchemy.orm import scoped_session, sessionmaker 
     4from sqlalchemy.ext.declarative import declarative_base 
    45 
    5 __all__ = ['Session', 'metadata'] 
     6__all__ = ['Session', 'metadata', 'Base'] 
    67 
    78# SQLAlchemy database engine.  Updated by model.init_model() 
    … …  
    1415# names, you'll need a metadata for each database 
    1516metadata = MetaData() 
     17 
     18Base = declarative_base(metadata=metadata) 

  • sandbox/tsauerwein/sample/mapfishsample/model/points.py

    r3440 r3450  
    1919 
    2020from sqlalchemy import Column, types 
    21 from sqlalchemy.ext.declarative import declarative_base 
    2221 
    2322from geoalchemy import GeometryColumn, Point, GeometryDDL 
    2423 
    2524from mapfish.sqlalchemygeom import GeometryTableMixIn 
    26 from mapfishsample.model.meta import metadata 
     25from mapfishsample.model.meta import Base 
    2726 
    28  
    29 Base = declarative_base(metadata=metadata) 
    3027 
    3128class Point(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/model/polygons.py

    r3440 r3450  
    1919 
    2020from sqlalchemy import Column, types 
    21 from sqlalchemy.ext.declarative import declarative_base 
    2221 
    2322from geoalchemy import GeometryColumn, Polygon, GeometryDDL 
    2423 
    2524from mapfish.sqlalchemygeom import GeometryTableMixIn 
    26 from mapfishsample.model.meta import metadata 
     25from mapfishsample.model.meta import Base 
    2726 
    28  
    29 Base = declarative_base(metadata=metadata) 
    3027 
    3128class Polygon(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/model/summits.py

    r3440 r3450  
    1818# 
    1919 
    20 from sqlalchemy.ext.declarative import declarative_base 
    21  
    2220from geoalchemy import GeometryColumn, Point 
    2321 
    2422from mapfish.sqlalchemygeom import GeometryTableMixIn 
    25 from mapfishsample.model.meta import metadata, engine 
     23from mapfishsample.model.meta import engine, Base 
    2624 
    27 Base = declarative_base(metadata=metadata) 
    2825 
    2926class Summit(Base, GeometryTableMixIn): 

  • sandbox/tsauerwein/sample/mapfishsample/websetup.py

    r3440 r3450  
    33 
    44from mapfishsample.config.environment import load_environment 
     5from mapfishsample.model import meta 
    56 
    67log = logging.getLogger(__name__) 
    … …  
    1415    load_environment(conf.global_conf, conf.local_conf) 
    1516 
    16     # Load the models 
    17     from mapfishsample.model import meta 
    18     meta.metadata.bind = meta.engine 
    19  
    2017    # Create the tables for the editing example (if they aren't there already) 
    21     from mapfishsample.model import points, lines, polygons 
    22      
    23     meta.metadata.create_all(checkfirst=True) 
    24      
     18    meta.metadata.create_all(bind=meta.engine)