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

[svn_fdo at osgeo.org]

Author: barbarazoladek
Date: 2007-01-22 15:24:19 -0500 (Mon, 22 Jan 2007)
New Revision: 660

Modified:
   trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsInsertCommand.cpp
Log:
FDO340 merge from branch 3.2

Modified: trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsInsertCommand.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsInsertCommand.cpp	2007-01-22 18:46:16 UTC (rev 659)
+++ trunk/Providers/GenericRdbms/Src/Fdo/FeatureCommands/FdoRdbmsInsertCommand.cpp	2007-01-22 20:24:19 UTC (rev 660)
@@ -382,7 +382,12 @@
 		{
 			idPropDef = idProperties->GetItem(i);
 			idProp = mPropertyValues->FindItem(idPropDef->GetName());
-		
+			if (!idProp)
+			{
+				if (mAutoGenPropertyValues)
+					// Check auto-generated values
+					idProp = mAutoGenPropertyValues->FindItem(idPropDef->GetName());
+			}
 			FdoPropertyValue *newIdProp = FdoPropertyValue::Create();
 			newIdProp->SetName( idPropDef->GetName() );
 			FdoDataValue *newValue = FdoDataValue::Create(idPropDef->GetDataType());
@@ -460,16 +465,10 @@
 					}
 				}
 				else
-				{
-					newValue->SetNull();
-					newIdProp->SetValue(newValue);
-				}
+					newIdProp->SetValue((FdoDataValue*)NULL);
 			}
 			else
-			{	
-				newValue->SetNull();
-				newIdProp->SetValue(newValue);
-			}
+				newIdProp->SetValue((FdoDataValue*)NULL);
 			featInfoCol->Add(newIdProp);
 			newValue->Release();
 			newIdProp->Release();