[fdo-commits] r2577 - trunk/Providers/GenericRdbms/Src/ODBC/Fdo

[svn_fdo at osgeo.org]

Author: thomasknoell
Date: 2007-02-21 18:20:29 -0500 (Wed, 21 Feb 2007)
New Revision: 2577

Modified:
   trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.cpp
   trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.h
Log:
This is an update to the previous code dropped to ensure that identity properties are not returned with data readers (port).

Modified: trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.cpp	2007-02-21 07:18:58 UTC (rev 2576)
+++ trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.cpp	2007-02-21 23:20:29 UTC (rev 2577)
@@ -185,7 +185,8 @@
     SqlCommandType cmdType, 
     FdoCommandType callerFdoCommand, 
     FdoRdbmsFilterUtilConstrainDef *inFilterConstrain,
-    bool forUpdate )
+    bool forUpdate,
+    FdoInt16 callerId )
 {
     const wchar_t * ret = NULL;
 
@@ -220,7 +221,7 @@
         addedPropDefs = true;
     }
 
-    ret = FdoRdbmsFilterProcessor::FilterToSql(filter, className, cmdType, callerFdoCommand, filterConstraint, forUpdate);
+    ret = FdoRdbmsFilterProcessor::FilterToSql(filter, className, cmdType, callerFdoCommand, filterConstraint, forUpdate, callerId);
 
     if (addedPropDefs)
         filterConstraint->selectedProperties = NULL;

Modified: trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.h	2007-02-21 07:18:58 UTC (rev 2576)
+++ trunk/Providers/GenericRdbms/Src/ODBC/Fdo/FdoRdbmsOdbcFilterProcessor.h	2007-02-21 23:20:29 UTC (rev 2577)
@@ -27,7 +27,7 @@
 
     ~FdoRdbmsOdbcFilterProcessor(void);
 
-    virtual const wchar_t* FilterToSql( FdoFilter  *filter, const wchar_t *className, SqlCommandType cmdType, FdoCommandType callerFdoCommand, FdoRdbmsFilterUtilConstrainDef *filterConstrain = NULL, bool forUpdate = false );
+    virtual const wchar_t* FilterToSql( FdoFilter  *filter, const wchar_t *className, SqlCommandType cmdType, FdoCommandType callerFdoCommand, FdoRdbmsFilterUtilConstrainDef *filterConstrain = NULL, bool forUpdate = false, FdoInt16 callerId = FdoCommandType_Select );
 
 protected: