[fdo-commits] r759 - branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands

[svn_fdo at osgeo.org]

Author: thomasknoell
Date: 2007-02-19 18:23:44 -0500 (Mon, 19 Feb 2007)
New Revision: 759

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


Modified: branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectAggregates.h
===================================================================
--- branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectAggregates.h	2007-02-17 23:27:02 UTC (rev 758)
+++ branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectAggregates.h	2007-02-19 23:23:44 UTC (rev 759)
@@ -81,7 +81,7 @@
         if( NULL == pSelect.p )
             throw FdoFilterException::Create(NlsMsgGet(FDORDBMS_22, errorMsg ));
 
-        return new FdoRdbmsDataReader( FdoPtr<FdoRdbmsFeatureReader>((FdoRdbmsFeatureReader*)pSelect->Execute( mbDistinct ) ) );
+        return new FdoRdbmsDataReader( FdoPtr<FdoRdbmsFeatureReader>((FdoRdbmsFeatureReader*)pSelect->Execute( mbDistinct, FdoCommandType_SelectAggregates ) ) );
     }
 
     /// <summary>Set the distinct option of the selection. Note that grouping criteria is not supported with Distinct.

Modified: branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp
===================================================================
--- branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp	2007-02-17 23:27:02 UTC (rev 758)
+++ branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.cpp	2007-02-19 23:23:44 UTC (rev 759)
@@ -80,7 +80,7 @@
     FDO_SAFE_RELEASE(mOrderingIdentifiers);
 }
 
-FdoIFeatureReader *FdoRdbmsSelectCommand::Execute( bool distinct )
+FdoIFeatureReader *FdoRdbmsSelectCommand::Execute( bool distinct, FdoInt16 callerId  )
 {
     int                 qid = -1;
     bool                res = false;
@@ -112,7 +112,13 @@
 		}
 
         // 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();
@@ -146,7 +152,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 );
                 }
             }
         }

Modified: branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.h
===================================================================
--- branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.h	2007-02-17 23:27:02 UTC (rev 758)
+++ branches/3.2.x/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsSelectCommand.h	2007-02-19 23:23:44 UTC (rev 759)
@@ -65,7 +65,7 @@
 
       //    Executes the select command and returns an object that
       //    implements IFeatureReader. Only distinct properties will be returned if distinct is set to true
-      FdoIFeatureReader *Execute ( bool distinct );
+      FdoIFeatureReader *Execute ( bool distinct, FdoInt16 callerId = FdoCommandType_Select );
 
       virtual ~FdoRdbmsSelectCommand();
 
@@ -97,7 +97,7 @@
 
       //    Executes the select command and returns an object that
       //    implements IFeatureReader.
-      virtual FdoIFeatureReader *Execute () { return Execute( false ); }
+      virtual FdoIFeatureReader *Execute () { return Execute( false, FdoCommandType_Select ); }
 
     /// <summary>Gets the IdentifierCollection that holds the list of property names to
     /// return with the result. If empty all properties of the specified class