[fdo-commits] r685 - trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Wed Jan 24 12:50:07 EST 2007
Author: brentrobinson
Date: 2007-01-24 12:50:07 -0500 (Wed, 24 Jan 2007)
New Revision: 685
Modified:
trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ClassDefinition.cpp
Log:
Merged from 3.2.x branch
Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ClassDefinition.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ClassDefinition.cpp 2007-01-24 16:54:31 UTC (rev 684)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ClassDefinition.cpp 2007-01-24 17:50:07 UTC (rev 685)
@@ -136,20 +136,22 @@
)
{
FdoSmLpSchemaP pSchema = GetLogicalPhysicalSchema();
+ FdoSmOvTableMappingType tableMappingType = FdoSmOvTableMappingType_Default;
- // Extract any class overrides
- if ( pClassOverrides ) {
- FdoRdbmsOvClassDefinition* pRdbmsOverrides = (FdoRdbmsOvClassDefinition*) pClassOverrides;
- FdoRdbmsOvTableP tableOverrides = pRdbmsOverrides->GetTable();
+ if ( (GetElementState() == FdoSchemaElementState_Added) || GetIsFromFdo() ) {
+ // Extract any class overrides
+ if ( pClassOverrides ) {
+ FdoRdbmsOvClassDefinition* pRdbmsOverrides = (FdoRdbmsOvClassDefinition*) pClassOverrides;
- if ( (GetElementState() == FdoSchemaElementState_Added) || GetIsFromFdo() ) {
- // TODO: the following is inconsistent with the way table name is handle
- // In both cases should report modification errors or ignore on modification.
- SetTableMapping( pRdbmsOverrides->GetTableMapping() );
+ tableMappingType = pRdbmsOverrides->GetTableMapping();
// Save the table mapping specified by overrides, since mDbObjectMapping
// may get defaulted.
- SetOvTableMapping( FdoSmOvTableMappingTypeMapper::Type2String( pRdbmsOverrides->GetTableMapping() ) );
+ SetOvTableMapping( FdoSmOvTableMappingTypeMapper::Type2String( tableMappingType ) );
}
+
+ // TODO: the following is inconsistent with the way table name is handle
+ // In both cases should report modification errors or ignore on modification.
+ SetTableMapping( tableMappingType );
}
}
More information about the fdo-commits
mailing list