[fdo-commits] r2553 - trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands

[svn_fdo at osgeo.org]

Author: thomasknoell
Date: 2007-02-19 18:14:19 -0500 (Mon, 19 Feb 2007)
New Revision: 2553

Modified:
   trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp
Log:
Required changes in the context of removing additional identity columns as part of the reader returned by the SelectAggregates command.

Modified: trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp	2007-02-19 23:13:17 UTC (rev 2552)
+++ trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp	2007-02-19 23:14:19 UTC (rev 2553)
@@ -79,7 +79,7 @@
     FDO_SAFE_RELEASE(mOrderingIdentifiers);
 }
 
-FdoIFeatureReader *FdoRdbmsSelectCommand::Execute( bool distinct )
+FdoIFeatureReader *FdoRdbmsSelectCommand::Execute( bool distinct, FdoInt16 callerId  )
 {
     int                 qid = -1;
     bool                res = false;
@@ -102,7 +102,13 @@
         filterConstrain.orderByProperties = mOrderingIdentifiers;
 
         // Call FilterToSql just to populate the filter's list of geometric conditions;
-        FdoString * sqlString = flterProcessor->FilterToSql( this->GetFilterRef(), this->GetClassNameRef()->GetText(), SqlCommandType_Select, FdoCommandType_Select, &filterConstrain, isForUpdate );
+        FdoString * sqlString = flterProcessor->FilterToSql( this->GetFilterRef(),
+                                                             this->GetClassNameRef()->GetText(),
+                                                             SqlCommandType_Select,
+                                                             FdoCommandType_Select,
+                                                             &filterConstrain,
+                                                             isForUpdate,
+                                                             callerId );
 
         FdoPtr<FdoRdbmsSecondarySpatialFilterCollection> geometricConditions = flterProcessor->GetGeometricConditions();
         FdoPtr<FdoIdentifierCollection> idsWithGeoms = FdoIdentifierCollection::Create();
@@ -136,7 +142,13 @@
                         idsWithGeoms->Insert(0, id);
                     }
                     filterConstrain.selectedProperties = idsWithGeoms;
-                    sqlString = flterProcessor->FilterToSql( this->GetFilterRef(), this->GetClassNameRef()->GetText(), SqlCommandType_Select, FdoCommandType_Select, &filterConstrain, isForUpdate );
+                    sqlString = flterProcessor->FilterToSql( this->GetFilterRef(),
+                                                             this->GetClassNameRef()->GetText(),
+                                                             SqlCommandType_Select,
+                                                             FdoCommandType_Select,
+                                                             &filterConstrain,
+                                                             isForUpdate,
+                                                             callerId );
                 }
             }
         }