[Modeling-cvs] ProjectModeling/Modeling CHANGES,1.108,1.109 DatabaseContext.py,1.15,1.16

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv11362

Modified Files:
	CHANGES DatabaseContext.py 
Log Message:
Fixed bug #753147: fetching twice or more with a given FetchSpecification
did not return the same result set (the original FetchSpec was modified)


Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/CHANGES,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** CHANGES	11 Jun 2003 11:10:11 -0000	1.108
--- CHANGES	12 Jun 2003 09:35:19 -0000	1.109
***************
*** 8,11 ****
--- 8,14 ----
    --------------------------------------------------------
  
+   * Fixed bug #753147: fetching twice or more with a given FetchSpecification
+     did not return the same result set (the original FetchSpec was modified)
+ 
    * New adaptor layer for SQLite
  

Index: DatabaseContext.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseContext.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatabaseContext.py	11 Jun 2003 11:02:49 -0000	1.15
--- DatabaseContext.py	12 Jun 2003 09:35:19 -0000	1.16
***************
*** 1478,1490 ****
        
      objects=[]
!     for entityName in entitiesNames:
!       aFetchSpec.setEntityName(entityName)
!       channel.selectObjectsWithFetchSpecification(aFetchSpec, anEditingContext)
!       object=channel.fetchObject()
!       while object:
!         objects.append(object)
!         #
          object=channel.fetchObject()
! 
      return objects
  
--- 1478,1494 ----
        
      objects=[]
!     original_entity_name=aFetchSpec.entityName()
!     try:
!       for entityName in entitiesNames:
!         aFetchSpec.setEntityName(entityName)
!         channel.selectObjectsWithFetchSpecification(aFetchSpec,
!                                                     anEditingContext)
          object=channel.fetchObject()
!         while object:
!           objects.append(object)
!           object=channel.fetchObject()
!     finally:
!       # Fixes bug #753147: aFetchSpec shouldn't be changed
!       aFetchSpec.setEntityName(original_entity_name)
      return objects