[fdo-commits] r116 - in trunk/Providers/ArcSDE: Src/Provider
Src/UnitTest TestData
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Tue Jan 23 14:10:53 EST 2007
Author: pierredalcourt
Date: 2007-01-23 14:10:53 -0500 (Tue, 23 Jan 2007)
New Revision: 116
Modified:
trunk/Providers/ArcSDE/Src/Provider/ArcSDEAcquireLockCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEActivateLongTransactionCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEApplySchemaCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDECommitLongTransactionCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.h
trunk/Providers/ArcSDE/Src/Provider/ArcSDECreateLongTransactionCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEDataReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeactivateLongTransactionCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeleteCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEDescribeSchemaCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEDestroySchemaCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEFeatureReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEFilterToSql.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockInfoCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockOwnersCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockedObjectsCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLongTransactionsCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEInsertCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDELockConflictReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDELockOwnersReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDELockedObjectReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionConflictDirectiveEnumerator.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEProvider.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEReleaseLockCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDERollbackLongTransactionCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLDataReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESchemaManager.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectAggregatesCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.h
trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.h
trunk/Providers/ArcSDE/Src/Provider/ArcSDETransaction.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEUpdateCommand.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.cpp
trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.h
trunk/Providers/ArcSDE/Src/Provider/stdafx.h
trunk/Providers/ArcSDE/Src/UnitTest/BasicConnectionTests.cpp
trunk/Providers/ArcSDE/Src/UnitTest/BasicSchemaTests.cpp
trunk/Providers/ArcSDE/Src/UnitTest/SelectTests.cpp
trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj
trunk/Providers/ArcSDE/TestData/SetupTestData.perl
Log:
ArcSDE: fix spatial reference SRID defect, misc clean ups.
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEAcquireLockCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEAcquireLockCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEAcquireLockCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
ArcSDEAcquireLockCommand::ArcSDEAcquireLockCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoIAcquireLock> (connection),
mType (FdoLockType_None),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEActivateLongTransactionCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEActivateLongTransactionCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEActivateLongTransactionCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDEActivateLongTransactionCommand::ArcSDEActivateLongTransactionCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIActivateLongTransaction> (connection),
mName ()
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEApplySchemaCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEApplySchemaCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEApplySchemaCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -20,13 +20,6 @@
#include "stdafx.h"
#include "ArcSDEUtils.h"
-#include <malloc.h>
-#include <string.h>
-
-#include <sdeerno.h>
-
-
-
ArcSDEApplySchemaCommand::ArcSDEApplySchemaCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIApplySchema> (connection),
mSchema (NULL)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDECommitLongTransactionCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDECommitLongTransactionCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDECommitLongTransactionCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDECommitLongTransactionCommand::ArcSDECommitLongTransactionCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoICommitLongTransaction> (connection),
mName ()
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,11 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-#include <string.h>
-
-#include <sdeerno.h>
#include <FdoCommonConnStringParser.h>
#include "ArcSDEProvider.h"
#include "ArcSDEUtils.h"
@@ -1395,7 +1390,7 @@
}
-void ArcSDEConnection::GetArcSDESpatialRefList(SE_SPATIALREFINFO** pSpatialRefInfoList, long *pCount)
+void ArcSDEConnection::GetArcSDESpatialRefList(SE_SPATIALREFINFO** pSpatialRefInfoList, LONG** pSpatialRefSridList, long *pCount)
{
if (mCachedSpatialRefList == NULL)
{
@@ -1503,6 +1498,7 @@
// Return cached spatial context list to caller:
*pSpatialRefInfoList = mCachedSpatialRefList;
+ *pSpatialRefSridList = mCachedSpatialRefSRIDList;
*pCount = mCachedSpatialRefListCount;
}
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.h
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.h 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEConnection.h 2007-01-23 19:10:53 UTC (rev 116)
@@ -323,7 +323,10 @@
// Get cached layer information:
long GetArcSDELayerInfo(SE_LAYERINFO &pLayerInfo, const CHAR* tableName, const CHAR* columnName);
- void GetArcSDESpatialRefList(SE_SPATIALREFINFO** pSpatialRefInfo, long *count);
+ // Get cached spatial reference information;
+ // NOTE: when retrieving SRIDs, if *pSpatialRefSrids!=NULL then rely on the SRIDs returned in pSpatialRefSrids as opposed
+ // to those in pSpatialRefInfo since they may not be set correctly:
+ void GetArcSDESpatialRefList(SE_SPATIALREFINFO** pSpatialRefInfoList, LONG** pSpatialRefSridList, long *count);
// Returns true if-and-only-if the given schemaname and classname are not NULL and have already been cached:
bool ClassAlreadyLoaded(FdoString* fdoSchemaName, FdoString* fdoClassName);
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDECreateLongTransactionCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDECreateLongTransactionCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDECreateLongTransactionCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
// set to 1 to delete an existing version of the same name
#define DRACONIAN 0
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEDataReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEDataReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEDataReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -20,12 +20,7 @@
#include "stdafx.h"
#include "ArcSDEUtils.h"
-#include <malloc.h>
-#include <string.h>
-#include <sdeerno.h>
-
-
ArcSDEDataReader::ArcSDEDataReader (ArcSDEConnection* connection, FdoClassDefinition* fdoClassDef, FdoFilter* filter, FdoIdentifierCollection* propertiesToSelect,
bool bDistinct, FdoOrderingOption eOrderingOption, FdoIdentifierCollection* pOrderingIds, FdoFilter* pGroupingFilter, FdoIdentifierCollection* pGroupingIds) :
ArcSDEReader(connection, fdoClassDef, propertiesToSelect),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeactivateLongTransactionCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeactivateLongTransactionCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeactivateLongTransactionCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDEDeactivateLongTransactionCommand::ArcSDEDeactivateLongTransactionCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIDeactivateLongTransaction> (connection)
{
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeleteCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeleteCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEDeleteCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,11 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-
-#include <sdeerno.h>
-
#include "ArcSDEUtils.h"
ArcSDEDeleteCommand::ArcSDEDeleteCommand (FdoIConnection *connection) :
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEDescribeSchemaCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEDescribeSchemaCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEDescribeSchemaCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -21,12 +21,6 @@
#include "ArcSDEUtils.h"
#include "ArcSDEProvider.h"
-#include <malloc.h>
-#include <string.h>
-
-#include <sdeerno.h>
-
-
ArcSDEDescribeSchemaCommand::ArcSDEDescribeSchemaCommand (FdoIConnection *connection, FdoIdentifier* fdoClassIdToLoad) :
ArcSDECommand<FdoIDescribeSchema> (connection),
mSchemaName (NULL)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEDestroySchemaCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEDestroySchemaCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEDestroySchemaCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
ArcSDEDestroySchemaCommand::ArcSDEDestroySchemaCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIDestroySchema> (connection),
mSchemaName (NULL)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEFeatureReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEFeatureReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEFeatureReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -20,12 +20,7 @@
#include "stdafx.h"
#include "ArcSDEUtils.h"
-#include <malloc.h>
-#include <string.h>
-#include <sdeerno.h>
-
-
ArcSDEFeatureReader::ArcSDEFeatureReader (ArcSDEConnection* connection, FdoClassDefinition* fdoClassDef, FdoFilter* filter, FdoIdentifierCollection* propertiesToSelect) :
ArcSDEReader(connection, fdoClassDef, propertiesToSelect),
mFilter (filter),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEFilterToSql.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEFilterToSql.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEFilterToSql.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,12 +18,6 @@
*/
#include "stdafx.h"
-
-#include <math.h>
-#include <malloc.h>
-#include <string.h>
-#include <typeinfo>
-
#include "ArcSDEUtils.h"
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockInfoCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockInfoCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockInfoCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
ArcSDEGetLockInfoCommand::ArcSDEGetLockInfoCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoIGetLockInfo> (connection)
{
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockOwnersCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockOwnersCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockOwnersCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
ArcSDEGetLockOwnersCommand::ArcSDEGetLockOwnersCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIGetLockOwners> (connection)
{
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockedObjectsCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockedObjectsCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLockedObjectsCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
ArcSDEGetLockedObjectsCommand::ArcSDEGetLockedObjectsCommand (FdoIConnection *connection) :
ArcSDECommand<FdoIGetLockedObjects> (connection)
{
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLongTransactionsCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLongTransactionsCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEGetLongTransactionsCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
#include <ArcSDELongTransactionReader.h>
ArcSDEGetLongTransactionsCommand::ArcSDEGetLongTransactionsCommand (FdoIConnection *connection) :
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEInsertCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEInsertCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEInsertCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,11 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-
-#include <sdeerno.h>
-
#include "ArcSDEUtils.h"
ArcSDEInsertCommand::ArcSDEInsertCommand (FdoIConnection *connection) :
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDELockConflictReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDELockConflictReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDELockConflictReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDELockConflictReader::ArcSDELockConflictReader (ArcSDEConnection* connection, FdoString* cls, CHAR* table, FdoString* property) :
mConnection (connection),
mClassName (cls),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDELockOwnersReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDELockOwnersReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDELockOwnersReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDELockOwnersReader::ArcSDELockOwnersReader () :
mOwners (OwnerArray::Create ()),
mIndex (-1)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDELockedObjectReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDELockedObjectReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDELockedObjectReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDELockedObjectReader::ArcSDELockedObjectReader (ArcSDEConnection* connection) :
mConnection (connection),
mLocks (LockCollection::Create ()),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionConflictDirectiveEnumerator.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionConflictDirectiveEnumerator.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionConflictDirectiveEnumerator.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDELongTransactionConflictDirectiveEnumerator::ArcSDELongTransactionConflictDirectiveEnumerator (ArcSDEConnection* connection) :
mConnection (connection),
mConflicts (ConflictCollection::Create ()),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDELongTransactionReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,10 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-#include <string.h>
-
#include <ArcSDELongTransactionReader.h>
ArcSDELongTransactionReader::ArcSDELongTransactionReader (ArcSDEConnection* connection, LONG count, SE_VERSIONINFO* info) :
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEProvider.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEProvider.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEProvider.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,9 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-
#include <ArcSDEProvider.h>
#ifdef _WIN32
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,10 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-#include <string.h>
-
#include "ArcSDEReader.h"
#include "ArcSDEUtils.h"
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEReleaseLockCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEReleaseLockCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEReleaseLockCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,10 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-
-#include <sdeerno.h>
-
typedef struct _lock
{
LONG id;
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDERollbackLongTransactionCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDERollbackLongTransactionCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDERollbackLongTransactionCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <sdeerno.h>
-
ArcSDERollbackLongTransactionCommand::ArcSDERollbackLongTransactionCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoIRollbackLongTransaction> (connection),
mName ()
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,11 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-
-#include <sdeerno.h>
-
#include "ArcSDESQLCommand.h"
#include "ArcSDEFeatureReader.h"
#include "ArcSDEUtils.h"
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLDataReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLDataReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESQLDataReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,9 +19,6 @@
#include "stdafx.h"
-#include <malloc.h>
-#include <sdeerno.h>
-
ArcSDESQLDataReader::ArcSDESQLDataReader (ArcSDEConnection *connection, SE_STREAM stream) :
ArcSDEReader(connection, NULL, NULL)
{
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESchemaManager.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESchemaManager.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESchemaManager.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -17,12 +17,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-#include <string.h>
-
-#include <sdeerno.h>
-
#include "ArcSDEUtils.h"
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectAggregatesCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectAggregatesCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectAggregatesCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -21,11 +21,7 @@
#include "ArcSDESelectAggregatesCommand.h"
#include "ArcSDEDataReader.h"
-#include <malloc.h>
-#include <sdeerno.h>
-
-
ArcSDESelectAggregatesCommand::ArcSDESelectAggregatesCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoISelectAggregates> (connection),
m_bDistinct(false),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESelectCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -21,11 +21,7 @@
#include "ArcSDESelectCommand.h"
#include "ArcSDEFeatureReader.h"
-#include <malloc.h>
-#include <sdeerno.h>
-
-
ArcSDESelectCommand::ArcSDESelectCommand (FdoIConnection *connection) :
ArcSDEFeatureCommand<FdoISelect> (connection),
mType (FdoLockType_None),
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -46,7 +46,7 @@
// this could be a potential issue if a client starts a spatial context reader
// and then closes the connection or creates/destroys a spatial context, then continues reading from the reader.
// However, the likelihood of such scenarios are rare.
- connection->GetArcSDESpatialRefList(&mArrSpatialRefs, &mlSpatialRefCount);
+ connection->GetArcSDESpatialRefList(&mArrSpatialRefs, &mArrSpatialRefSrids, &mlSpatialRefCount);
mlCurrentSpatialRef = -1L;
mlActiveOnlySRID = -1L;
}
@@ -73,7 +73,7 @@
if (mSpatialContextName == L"")
{
- mSpatialContextName = ArcSDESpatialContextUtility::GetSpatialContextName(mArrSpatialRefs[mlCurrentSpatialRef]);
+ mSpatialContextName = ArcSDESpatialContextUtility::GetSpatialContextName(mArrSpatialRefs[mlCurrentSpatialRef], mArrSpatialRefSrids ? mArrSpatialRefSrids[mlCurrentSpatialRef] : -1);
}
return mSpatialContextName;
@@ -317,8 +317,13 @@
LONG lSRID = -1L;
LONG lResult = SE_SUCCESS;
- lResult = SE_spatialrefinfo_get_srid(mArrSpatialRefs[mlCurrentSpatialRef], &lSRID);
- handle_sde_err<FdoException>(lResult, __FILE__, __LINE__, ARCSDE_FAILED_TO_READ_SRS, "Failed to get or set information for this ArcSDE Spatial Reference System.");
+ if (mArrSpatialRefSrids)
+ lSRID = mArrSpatialRefSrids[mlCurrentSpatialRef];
+ else
+ {
+ lResult = SE_spatialrefinfo_get_srid(mArrSpatialRefs[mlCurrentSpatialRef], &lSRID);
+ handle_sde_err<FdoException>(lResult, __FILE__, __LINE__, ARCSDE_FAILED_TO_READ_SRS, "Failed to get or set information for this ArcSDE Spatial Reference System.");
+ }
return lSRID;
}
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.h
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.h 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextReader.h 2007-01-23 19:10:53 UTC (rev 116)
@@ -52,6 +52,7 @@
FdoPtr<ArcSDEConnection> mConnection;
SE_SPATIALREFINFO *mArrSpatialRefs;
+ LONG *mArrSpatialRefSrids;
LONG mlSpatialRefCount;
LONG mlCurrentSpatialRef;
long mlActiveOnlySRID;
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -63,7 +63,7 @@
}
-FdoStringP ArcSDESpatialContextUtility::GetSpatialContextName(SE_SPATIALREFINFO spatialRefInfo)
+FdoStringP ArcSDESpatialContextUtility::GetSpatialContextName(SE_SPATIALREFINFO spatialRefInfo, LONG srid)
{
FdoStringP spatialContextName;
LONG lResult = -1;
@@ -86,8 +86,13 @@
else // use SRID as name
{
LONG lSRID = -1;
- lResult = SE_spatialrefinfo_get_srid(spatialRefInfo, &lSRID);
- handle_sde_err<FdoException>(lResult, __FILE__, __LINE__, ARCSDE_FAILED_TO_READ_SRS, "Failed to get or set information for this ArcSDE Spatial Reference System.");
+ if (srid != -1)
+ lSRID = srid;
+ else
+ {
+ lResult = SE_spatialrefinfo_get_srid(spatialRefInfo, &lSRID);
+ handle_sde_err<FdoException>(lResult, __FILE__, __LINE__, ARCSDE_FAILED_TO_READ_SRS, "Failed to get or set information for this ArcSDE Spatial Reference System.");
+ }
wchar_t wBuffer[50];
spatialContextName = FdoCommonOSUtil::ltow(lSRID, wBuffer, 50);
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.h
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.h 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDESpatialContextUtility.h 2007-01-23 19:10:53 UTC (rev 116)
@@ -29,7 +29,7 @@
static FdoStringP SRIDToSpatialContextName(ArcSDEConnection* connection, LONG srid);
// Get the spatial context name from an ArcSDE SE_SPATIALREFINFO:
- static FdoStringP GetSpatialContextName(SE_SPATIALREFINFO spatialRefInfo);
+ static FdoStringP GetSpatialContextName(SE_SPATIALREFINFO spatialRefInfo, LONG srid = -1);
// Get the spatial context name from an ArcSDE authname and SRID:
static FdoStringP GetSpatialContextName(FdoString* authName, LONG srid);
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDETransaction.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDETransaction.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDETransaction.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,13 +18,8 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-#include <string.h>
#include "ArcSDEUtils.h"
-#include <sdeerno.h>
-
ArcSDETransaction::ArcSDETransaction () :
mConnection (NULL),
mSpent (false)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEUpdateCommand.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEUpdateCommand.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEUpdateCommand.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,11 +18,6 @@
*/
#include "stdafx.h"
-
-#include <malloc.h>
-
-#include <sdeerno.h>
-
#include "ArcSDEUtils.h"
static int OS__cdecl compare (const void *key, const void *element)
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -19,8 +19,6 @@
#include "stdafx.h"
-#include <math.h>
-
#include "ArcSDEUtils.h"
#ifdef _WIN32
Modified: trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.h
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.h 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/ArcSDEUtils.h 2007-01-23 19:10:53 UTC (rev 116)
@@ -18,10 +18,7 @@
#ifndef ARCSDEUTILS_H
#define ARCSDEUTILS_H
-#include <malloc.h>
-
-
// Constants for ArcSDE Metadata:
extern const char* METADATA_CN_CLASSSCHEMA;
extern const char* METADATA_CN_CLASSNAME;
Modified: trunk/Providers/ArcSDE/Src/Provider/stdafx.h
===================================================================
--- trunk/Providers/ArcSDE/Src/Provider/stdafx.h 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/Provider/stdafx.h 2007-01-23 19:10:53 UTC (rev 116)
@@ -32,7 +32,11 @@
#include <limits> // For quiet_NaN()
#include <float.h> // For _isnan()
#include <stdlib.h>
+#include <string.h>
+#include <typeinfo>
+#include <sdeerno.h>
+
#include <FdoSde.h>
#include <FdoCommon.h>
Modified: trunk/Providers/ArcSDE/Src/UnitTest/BasicConnectionTests.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/BasicConnectionTests.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/UnitTest/BasicConnectionTests.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -276,128 +276,7 @@
}
}
-static wchar_t* Command (int command)
-{
- wchar_t* ret;
- switch (command)
- {
- case FdoCommandType_Select:
- ret = L"FdoCommandType_Select";
- break;
- case FdoCommandType_Insert:
- ret = L"FdoCommandType_Insert";
- break;
- case FdoCommandType_Delete:
- ret = L"FdoCommandType_Delete";
- break;
- case FdoCommandType_Update:
- ret = L"FdoCommandType_Update";
- break;
- case FdoCommandType_DescribeSchema:
- ret = L"FdoCommandType_DescribeSchema";
- break;
- case FdoCommandType_ApplySchema:
- ret = L"FdoCommandType_ApplySchema";
- break;
- case FdoCommandType_DestroySchema:
- ret = L"FdoCommandType_DestroySchema";
- break;
- case FdoCommandType_ActivateSpatialContext:
- ret = L"FdoCommandType_ActivateSpatialContext";
- break;
- case FdoCommandType_CreateSpatialContext:
- ret = L"FdoCommandType_CreateSpatialContext";
- break;
- case FdoCommandType_DestroySpatialContext:
- ret = L"FdoCommandType_DestroySpatialContext";
- break;
- case FdoCommandType_GetSpatialContexts:
- ret = L"FdoCommandType_GetSpatialContexts";
- break;
- case FdoCommandType_CreateMeasureUnit:
- ret = L"FdoCommandType_CreateMeasureUnit";
- break;
- case FdoCommandType_DestroyMeasureUnit:
- ret = L"FdoCommandType_DestroyMeasureUnit";
- break;
- case FdoCommandType_GetMeasureUnits:
- ret = L"FdoCommandType_GetMeasureUnits";
- break;
- case FdoCommandType_SQLCommand:
- ret = L"FdoCommandType_SQLCommand";
- break;
- case FdoCommandType_AcquireLock:
- ret = L"FdoCommandType_AcquireLock";
- break;
- case FdoCommandType_GetLockInfo:
- ret = L"FdoCommandType_GetLockInfo";
- break;
- case FdoCommandType_GetLockedObjects:
- ret = L"FdoCommandType_GetLockedObjects";
- break;
- case FdoCommandType_GetLockOwners:
- ret = L"FdoCommandType_GetLockOwners";
- break;
- case FdoCommandType_ReleaseLock:
- ret = L"FdoCommandType_ReleaseLock";
- break;
- case FdoCommandType_ActivateLongTransaction:
- ret = L"FdoCommandType_ActivateLongTransaction";
- break;
- case FdoCommandType_DeactivateLongTransaction:
- ret = L"FdoCommandType_DeactivateLongTransaction";
- break;
- case FdoCommandType_CommitLongTransaction:
- ret = L"FdoCommandType_CommitLongTransaction";
- break;
- case FdoCommandType_CreateLongTransaction:
- ret = L"FdoCommandType_CreateLongTransaction";
- break;
- case FdoCommandType_GetLongTransactions:
- ret = L"FdoCommandType_GetLongTransactions";
- break;
- case FdoCommandType_FreezeLongTransaction:
- ret = L"FdoCommandType_FreezeLongTransaction";
- break;
- case FdoCommandType_RollbackLongTransaction:
- ret = L"FdoCommandType_RollbackLongTransaction";
- break;
- case FdoCommandType_ActivateLongTransactionCheckpoint:
- ret = L"FdoCommandType_ActivateLongTransactionCheckpoint";
- break;
- case FdoCommandType_CreateLongTransactionCheckpoint:
- ret = L"FdoCommandType_CreateLongTransactionCheckpoint";
- break;
- case FdoCommandType_GetLongTransactionCheckpoints:
- ret = L"FdoCommandType_GetLongTransactionCheckpoints";
- break;
- case FdoCommandType_RollbackLongTransactionCheckpoint:
- ret = L"FdoCommandType_RollbackLongTransactionCheckpoint";
- break;
- case FdoCommandType_ChangeLongTransactionPrivileges:
- ret = L"FdoCommandType_ChangeLongTransactionPrivileges";
- break;
- case FdoCommandType_GetLongTransactionPrivileges:
- ret = L"FdoCommandType_GetLongTransactionPrivileges";
- break;
- case FdoCommandType_ChangeLongTransactionSet:
- ret = L"FdoCommandType_ChangeLongTransactionSet";
- break;
- case FdoCommandType_GetLongTransactionsInSet:
- ret = L"FdoCommandType_GetLongTransactionsInSet";
- break;
- case FdoCommandType_FirstProviderCommand:
- ret = L"FdoCommandType_FirstProviderCommand";
- break;
- default:
- ret = L"Unknown command";
- break;
- }
-
- return (ret);
-}
-
void BasicConnectionTests::command_capabilities ()
{
if (CreateSchemaOnly()) return;
@@ -412,7 +291,7 @@
commands = command_capabilities->GetCommands (length);
for (int i = 0; i < length; i++)
{
- wprintf (L" The provider supports command %ls.\n", Command (*commands));
+ wprintf (L" The provider supports command %ls.\n", (FdoString *)FdoCommonMiscUtil::FdoCommandTypeToString(*commands));
commands++;
}
wprintf (L" The provider commands do %lssupport parameterization.\n", (command_capabilities->SupportsParameters () ? L"" : L"not "));
Modified: trunk/Providers/ArcSDE/Src/UnitTest/BasicSchemaTests.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/BasicSchemaTests.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/UnitTest/BasicSchemaTests.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -212,8 +212,15 @@
try
{
+ double startSeconds = (double)(long)clock()/1000.0;
+ printf("\nBasicSchemaTests::describe(): describeschema begin clock=%f", startSeconds);
+
FdoIDescribeSchema* describe = (FdoIDescribeSchema*)mConnection->CreateCommand (FdoCommandType_DescribeSchema);
FdoFeatureSchemaCollection* schemas = describe->Execute ();
+
+ double endSeconds = (double)(long)clock()/1000.0;
+ printf("\nBasicSchemaTests::describe(): describeschema end clock=%f, elapsed time=%f", endSeconds, endSeconds-startSeconds);
+
show_schema (schemas);
schemas->Release ();
describe->Release ();
Modified: trunk/Providers/ArcSDE/Src/UnitTest/SelectTests.cpp
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/SelectTests.cpp 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/UnitTest/SelectTests.cpp 2007-01-23 19:10:53 UTC (rev 116)
@@ -112,6 +112,9 @@
try
{
+ double secs_start = ((double)(long)clock()) / 1000.0;
+ printf("\nSelect and read all properties begin: clock=%f\n", secs_start);
+
FdoPtr<FdoISelect> select = (FdoISelect*)mConnection->CreateCommand (FdoCommandType_Select);
select->SetFeatureClassName (ArcSDETestConfig::QClassNameOntarioRoads());
FdoPtr<FdoIFeatureReader> reader = select->Execute ();
@@ -136,6 +139,10 @@
}
printf("\nFeatures Read=%d\n", lCount);
reader->Close();
+
+ double secs_end = ((double)(long)clock()) / 1000.0;
+ printf("\nFeatures Read=%d\n", lCount);
+ printf("\nSelect and read all properties end: clock=%f, elapsed time=%f, features per sec=%f\n", secs_end, secs_end-secs_start, (double)lCount/(secs_end-secs_start));
}
catch (FdoException *e)
{
Modified: trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj
===================================================================
--- trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/Src/UnitTest/UnitTest.vcproj 2007-01-23 19:10:53 UTC (rev 116)
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="pe91.lib sde91.lib cppunitd.lib FDO.lib FDOCommon.lib FDOGeometry.lib ProvidersCommon.lib Advapi32.lib"
+ AdditionalDependencies="pe91.lib sde91.lib cppunitd.lib FDO.lib FDOCommon.lib FDOGeometry.lib FdoSpatial.lib ProvidersCommon.lib Advapi32.lib"
OutputFile="$(OutDir)/UnitTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(FDOTHIRDPARTY)\ESRI\ArcSDEClient91\Windows\lib;"$(SDEHOME)\lib";$(FDOTHIRDPARTY)\cppunit\lib;$(FDO)\Unmanaged\Lib\Win32\Debug;$(FDOUTILITIES)\Common\Lib\Win32\Debug"
@@ -159,7 +159,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/fixed:no"
- AdditionalDependencies="pe91.lib sde91.lib cppunit.lib FDO.lib FDOCommon.lib FDOGeometry.lib ProvidersCommon.lib Advapi32.lib"
+ AdditionalDependencies="pe91.lib sde91.lib cppunit.lib FDO.lib FDOCommon.lib FDOGeometry.lib FdoSpatial.lib ProvidersCommon.lib Advapi32.lib"
OutputFile="$(OutDir)/UnitTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(FDOTHIRDPARTY)\ESRI\ArcSDEClient91\Windows\lib;"$(SDEHOME)\lib";$(FDOTHIRDPARTY)\cppunit\lib;$(FDO)\Unmanaged\Lib\Win32\Release;$(FDOUTILITIES)\Common\Lib\Win32\Release"
Modified: trunk/Providers/ArcSDE/TestData/SetupTestData.perl
===================================================================
--- trunk/Providers/ArcSDE/TestData/SetupTestData.perl 2007-01-23 18:43:44 UTC (rev 115)
+++ trunk/Providers/ArcSDE/TestData/SetupTestData.perl 2007-01-23 19:10:53 UTC (rev 116)
@@ -189,9 +189,13 @@
print TEMPSQL "\nEXEC sp_grantdbaccess '" . $username . "';";
# Give users db_owner rights on databases; this allows user to see eachother's tables as well as perform select/insert/update/delete on eachother's tables:
if ($username eq $readonlyusername)
+ {
print TEMPSQL "\nEXEC sp_addrolemember 'db_datareader', '" . $username . "';";
+ }
else
+ {
print TEMPSQL "\nEXEC sp_addrolemember 'db_owner', '" . $username . "';";
+ }
print TEMPSQL "\nGRANT CREATE TABLE, CREATE PROCEDURE, CREATE VIEW, CREATE FUNCTION TO " . $username . ";";
}
}
More information about the fdo-commits
mailing list