Changeset 3843 for framework

Show
Ignore:
Timestamp:
08/08/11 10:48:05 (10 months ago)
Author:
elemoine
Message:

framework.server - make the 1.2 branch work with SQLAlchemy 0.6, r=pgiraud (closes #644)

Location:
framework/server/branches/1.2
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • framework/server/branches/1.2/mapfish/lib/protocol.py

    r3388 r3843  
    285285 
    286286        order_by = self._get_order_by(request) 
    287         if order_by: 
     287        if order_by is not None: 
    288288            query = query.order_by(order_by) 
    289289 

  • framework/server/branches/1.2/mapfish/sqlalchemygeom.py

    r3564 r3843  
    113113        return convert 
    114114 
    115     def result_processor(self, dialect): 
     115    def result_processor(self, dialect, coltype=None): 
    116116        # convert value from database to a geometry object 
    117117        def convert(value): 
    … …  
    200200    def geometry_column(cls): 
    201201        """ Returns the table's geometry column or None if the table has no geometry column. """ 
    202         if not cls.__geometry_column__: 
     202        if cls.__geometry_column__ is None: 
    203203            columns = [c for c in cls.__table__.columns if isinstance(c.type, Geometry)] 
    204204            if not columns: 
    … …  
    213213    def primary_key_column(cls): 
    214214        """ Returns the table's primary key column """ 
    215         if not cls.__primary_key_column__: 
     215        if cls.__primary_key_column__ is None: 
    216216            keys = [k for k in cls.__table__.primary_key] 
    217217            if not keys: 

  • framework/server/branches/1.2/setup.py

    r3780 r3843  
    4343 
    4444setup(name                 = 'mapfish', 
    45       version              = '1.2.3', 
     45      version              = '1.2.4', 
    4646      license              = 'LGPLv3', 
    4747      install_requires     = requirements,