[fdo-commits] r2547 - in trunk: Providers/GenericRdbms/Inc/Rdbms/Override Providers/GenericRdbms/Src/MySQL/SchemaMgr/Lp Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph Providers/GenericRdbms/Src/SchemaMgr/Lp Providers/GenericRdbms/Src/SchemaMgr/Ov Providers/GenericRdbms/Src/SchemaMgr/Ph Providers/GenericRdbms/Src/UnitTest Providers/GenericRdbms/Src/UnitTest/Common Utilities/SchemaMgr/Src/Sm/Lp Utilities/SchemaMgr/Src/Sm/Ph

svn_fdo at osgeo.org svn_fdo at osgeo.org
Thu Feb 15 16:34:41 EST 2007


Author: brentrobinson
Date: 2007-02-15 16:34:40 -0500 (Thu, 15 Feb 2007)
New Revision: 2547

Modified:
   trunk/Providers/GenericRdbms/Inc/Rdbms/Override/RdbmsOvGeometricPropertyDefinition.h
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Lp/GeometricPropertyDefinition.cpp
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.h
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.cpp
   trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.h
   trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ObjectPropertyDefinition.cpp
   trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/PropertyMappingConcrete.cpp
   trunk/Providers/GenericRdbms/Src/SchemaMgr/Ov/RdbmsOvGeometricPropertyDefinition.cpp
   trunk/Providers/GenericRdbms/Src/SchemaMgr/Ph/Mgr.cpp
   trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoApplySchemaTest.cpp
   trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.cpp
   trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.h
   trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalBender.xslt
   trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalFormatter.xslt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test1_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test2_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test3_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test4_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test5_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test_ov3_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt
   trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt
   trunk/Utilities/SchemaMgr/Src/Sm/Lp/ClassDefinition.cpp
   trunk/Utilities/SchemaMgr/Src/Sm/Ph/Table.cpp
Log:
View support - Aligned MySql Schema Manager with changes to generic level. Fixed various memory leaks.

Modified: trunk/Providers/GenericRdbms/Inc/Rdbms/Override/RdbmsOvGeometricPropertyDefinition.h
===================================================================
--- trunk/Providers/GenericRdbms/Inc/Rdbms/Override/RdbmsOvGeometricPropertyDefinition.h	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Inc/Rdbms/Override/RdbmsOvGeometricPropertyDefinition.h	2007-02-15 21:34:40 UTC (rev 2547)
@@ -110,7 +110,7 @@
     FDORDBMS_OV_API virtual void _writeXmlContents(FdoXmlWriter* xmlWriter, const FdoXmlFlags* flags);
 
 private:
-    FdoRdbmsOvGeometricColumn* mColumn;
+    FdoPtr<FdoRdbmsOvGeometricColumn> mColumn;
     FdoSmOvGeometricColumnType  mGeometricColumnType;
     FdoSmOvGeometricContentType mGeometricContentType;
     FdoStringP                     mXColumnName;

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Lp/GeometricPropertyDefinition.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Lp/GeometricPropertyDefinition.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Lp/GeometricPropertyDefinition.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -142,12 +142,12 @@
     FdoMySQLOvGeometricPropertyDefinition* mqlGeomPropOverrides = dynamic_cast<FdoMySQLOvGeometricPropertyDefinition*>(pPropOverrides);
     if (mqlGeomPropOverrides)
     {
-        FdoMySQLOvGeometricColumn* mqlGeomColOverrides = mqlGeomPropOverrides->GetColumn();
+        FdoMySQLOvGeometricColumnP mqlGeomColOverrides = mqlGeomPropOverrides->GetColumn();
         if (mqlGeomColOverrides)
         {
             // Handle mappings for new objects or ones that originated from FDO config doc.
             if ( (elementState == FdoSchemaElementState_Added) || GetIsFromFdo() ) {
-                // no SQL Server-specific mappings to update, currently.
+                // no MySQL-specific mappings to update, currently.
             }
             else
             {

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -20,6 +20,8 @@
 #include "DbObject.h"
 #include "Owner.h"
 #include "Rd/ColumnReader.h"
+#include "Rd/PkeyReader.h"
+#include "Rd/FkeyReader.h"
 #include "ColumnChar.h"
 #include "ColumnBool.h"
 #include "ColumnByte.h"
@@ -396,7 +398,20 @@
     return new FdoSmPhRdMySqlColumnReader( GetManager(), FDO_SAFE_ADDREF(this) );
 }
 
+FdoPtr<FdoSmPhRdPkeyReader> FdoSmPhMySqlDbObject::CreatePkeyReader() const
+{
+    FdoSmPhMySqlDbObject* pDbObject = (FdoSmPhMySqlDbObject*) this;
 
+    return new FdoSmPhRdMySqlPkeyReader( pDbObject->GetManager(), FDO_SAFE_ADDREF(pDbObject) );
+}
+
+FdoPtr<FdoSmPhRdFkeyReader> FdoSmPhMySqlDbObject::CreateFkeyReader() const
+{
+    FdoSmPhMySqlDbObject* pDbObject = (FdoSmPhMySqlDbObject*) this;
+
+    return new FdoSmPhRdMySqlFkeyReader( pDbObject->GetManager(), FDO_SAFE_ADDREF(pDbObject) );
+}
+
 MySQLOvStorageEngineType FdoSmPhMySqlDbObject::StorageEngineStringToEnum(FdoString* storageEngine)
 {
     MySQLOvStorageEngineType ret;

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.h	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/DbObject.h	2007-02-15 21:34:40 UTC (rev 2547)
@@ -218,8 +218,10 @@
         FdoSmPhRdColumnReader* colRdr = NULL
     );
 
-    // Column reader creator implementation.
+    // Implementations for creating column, primary key and foreign key readers
     virtual FdoPtr<FdoSmPhRdColumnReader> CreateColumnReader();
+    virtual FdoPtr<FdoSmPhRdPkeyReader> CreatePkeyReader() const;
+    virtual FdoPtr<FdoSmPhRdFkeyReader> CreateFkeyReader() const;
 
 private:
 	FdoStringP mAutoIncrementColumnName;

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -20,8 +20,6 @@
 #include "Table.h"
 #include "Owner.h"
 #include "Mgr.h"
-#include "Rd/PkeyReader.h"
-#include "Rd/FkeyReader.h"
 #include "Rd/ConstraintReader.h"
 #include "Rd/IndexReader.h"
 
@@ -52,20 +50,6 @@
     // (these engines do support transactions).
 }
 
-FdoPtr<FdoSmPhRdPkeyReader> FdoSmPhMySqlTable::CreatePkeyReader() const
-{
-    FdoSmPhMySqlTable* pTable = (FdoSmPhMySqlTable*) this;
-
-    return new FdoSmPhRdMySqlPkeyReader( pTable->GetManager(), FDO_SAFE_ADDREF(pTable) );
-}
-
-FdoPtr<FdoSmPhRdFkeyReader> FdoSmPhMySqlTable::CreateFkeyReader() const
-{
-    FdoSmPhMySqlTable* pTable = (FdoSmPhMySqlTable*) this;
-
-    return new FdoSmPhRdMySqlFkeyReader( pTable->GetManager(), FDO_SAFE_ADDREF(pTable) );
-}
-
 FdoPtr<FdoSmPhRdIndexReader> FdoSmPhMySqlTable::CreateIndexReader() const
 {
     FdoSmPhMySqlTable* pTable = (FdoSmPhMySqlTable*) this;

Modified: trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.h	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/MySQL/SchemaMgr/Ph/Table.h	2007-02-15 21:34:40 UTC (rev 2547)
@@ -24,8 +24,8 @@
 
 #include "DbObject.h"
 #include "../../../SchemaMgr/Ph/Table.h"
-#include "Fkey.h"
 #include "Index.h"
+#include "Fkey.h"
 
 // MySql Provider implementation of a Table.
 // Represents an MySql schema (user)
@@ -54,10 +54,8 @@
     // No lock types currently supported in MySql.
 	virtual const FdoLockType* GetLockTypes(FdoInt32& size) const;
 
-    // Implementations for creating primary key, foreign key and
+    // Implementations for creating constraint and
     // index readers.
-    virtual FdoPtr<FdoSmPhRdPkeyReader> CreatePkeyReader() const;
-    virtual FdoPtr<FdoSmPhRdFkeyReader> CreateFkeyReader() const;
     virtual FdoPtr<FdoSmPhRdConstraintReader> CreateConstraintReader( FdoString* type ) const;
     virtual FdoPtr<FdoSmPhRdIndexReader> CreateIndexReader() const;
 

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ObjectPropertyDefinition.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ObjectPropertyDefinition.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/ObjectPropertyDefinition.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -149,7 +149,7 @@
 
     // Extract the physical overrides
     if ( pObjectPropOverrides ) {
-        mMappingOverrides = FDO_SAFE_ADDREF(pObjectPropOverrides->GetMappingDefinition());
+        mMappingOverrides = pObjectPropOverrides->GetMappingDefinition();
 
         FdoRdbmsOvPropertyMappingSingleP singleMapping =
             FDO_SAFE_ADDREF(dynamic_cast<FdoRdbmsOvPropertyMappingSingle*>(mMappingOverrides.p));

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/PropertyMappingConcrete.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/PropertyMappingConcrete.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/Lp/PropertyMappingConcrete.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -46,7 +46,7 @@
                         pParentType, 
                         this, 
                         FdoSmLpPropertyMappingType_Concrete, 
-                        pConcreteOverrides ? pConcreteOverrides->GetInternalClass() : NULL
+                        pConcreteOverrides ? FdoRdbmsOvClassP(pConcreteOverrides->GetInternalClass()) : FdoRdbmsOvClassP()
                    ) 
         );
 	}

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/Ov/RdbmsOvGeometricPropertyDefinition.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/Ov/RdbmsOvGeometricPropertyDefinition.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/Ov/RdbmsOvGeometricPropertyDefinition.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -25,7 +25,6 @@
 
 FdoRdbmsOvGeometricPropertyDefinition::FdoRdbmsOvGeometricPropertyDefinition()
 :
-    mColumn(NULL),
     mGeometricColumnType(FdoSmOvGeometricColumnType_Default),
     mGeometricContentType(FdoSmOvGeometricContentType_Default)
 {
@@ -33,7 +32,6 @@
 
 FdoRdbmsOvGeometricPropertyDefinition::FdoRdbmsOvGeometricPropertyDefinition(FdoString* name)
 :
-    mColumn(NULL),
     FdoRdbmsOvPropertyDefinition(name),
     mGeometricColumnType(FdoSmOvGeometricColumnType_Default),
     mGeometricContentType(FdoSmOvGeometricContentType_Default)

Modified: trunk/Providers/GenericRdbms/Src/SchemaMgr/Ph/Mgr.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/SchemaMgr/Ph/Mgr.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/SchemaMgr/Ph/Mgr.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -116,31 +116,27 @@
         
             // Table is not in any table list so check if it matches the table prefix
 
-            // Keyless objects are skipped unless explicitly referenced
-            // by the table list.
-            if ( hasKey ) {
-                // Not in the list so check if it starts with the table prefix
+            // Not in the list so check if it starts with the table prefix
 
-                FdoStringP tablePrefix = autoGen->GetGenTablePrefix();
+            FdoStringP tablePrefix = autoGen->GetGenTablePrefix();
 
-                if ( tablePrefix != L"" ) {
-                    if ( tableName.Mid( 0, tablePrefix.GetLength()).ICompare(tablePrefix) == 0 ) {
-                        // Table name starts with the prefix. Remove prefix to generate class name
-                        // if directed to do so.
-                        if ( autoGen->GetRemoveTablePrefix() )
-                            className = tableName.Mid( tablePrefix.GetLength(), 9999 );
-                        else
-                            className = tableName;
-                    }
-                }
-                else {
-                    if ( tableList->GetCount() == 0 ) {
-                        // Special case. If table list is empty and table prefix blank then 
-                        // always reverse-engineer this table.
+            if ( tablePrefix != L"" ) {
+                if ( tableName.Mid( 0, tablePrefix.GetLength()).ICompare(tablePrefix) == 0 ) {
+                    // Table name starts with the prefix. Remove prefix to generate class name
+                    // if directed to do so.
+                    if ( autoGen->GetRemoveTablePrefix() )
+                        className = tableName.Mid( tablePrefix.GetLength(), 9999 );
+                    else
                         className = tableName;
-                    }
                 }
             }
+            else {
+                if ( tableList->GetCount() == 0 ) {
+                    // Special case. If table list is empty and table prefix blank then 
+                    // always reverse-engineer this table.
+                    className = tableName;
+                }
+            }
         }
     }
 

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoApplySchemaTest.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoApplySchemaTest.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoApplySchemaTest.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -245,7 +245,6 @@
 
 		// First do xml dumps of LogicalPhysical schema
 
-#ifndef RDBI_DEF_SSQL
         FdoStringP out1master = LogicalPhysicalBend(L"apply_schema_test1_master.txt");
         FdoStringP out1       = LogicalPhysicalFormat(UnitTestUtil::GetOutputFileName( L"apply_schema_test1.xml" ) );
 
@@ -262,6 +261,11 @@
         UnitTestUtil::CheckOutput( (const char*) out2master,(const char*) out2 );
         UnitTestUtil::CheckOutput( (const char*) out3master,(const char*) out3 );
         UnitTestUtil::CheckOutput( (const char*) out4master,(const char*) out4 );
+#ifdef RDBI_DEF_ORA
+        // TODO: This comparison gets differences on MySQL and SqlServer
+        // The differences are due to different  table name max lengths in 
+        // Oracle, MySQL, SqlServer. Some enhancements to the LogicalPhysicalBender
+        // might resolve this one.
         UnitTestUtil::CheckOutput( (const char*) out5master,(const char*) out5 );
 #endif
 
@@ -709,6 +713,7 @@
 			false,
             DB_NAME_FOREIGN_SUFFIX
 		);
+
     }
 	catch ( FdoException* e ) 
 	{
@@ -5327,7 +5332,7 @@
     mapping->SetPrefix( L"FLRC" );
 
     pClass = CreateOvClassDefinition( L"OneForeign" );
-    ClassOvSetTable( pClass, CreateOvTable(L"oneforeign") );
+    ClassOvSetTable( pClass, FdoRdbmsOvTableP(CreateOvTable(L"oneforeign")) );
     ClassesOvAdd(pOverrides, pClass);
 
     return pOverrides;
@@ -5858,7 +5863,7 @@
         }
     }
         
-	insertCommand->Execute();
+	FdoPtr<FdoIFeatureReader> rdr = insertCommand->Execute();
 
     trans->Commit();
     FDO_SAFE_RELEASE(trans);

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.cpp
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -1800,9 +1800,11 @@
         owner->SetPassword( L"test" );
 
         CreateExternalTable( owner, table_id_geom, true, m_hasGeom, m_hasAssoc );
+        CreateExternalView( owner, L"VIEW_ID_GEOM", table_id_geom, true, m_hasGeom, false );
         CreateExternalTable( owner, L"TABLE_NOID_GEOM", false, m_hasGeom, false );
         CreateExternalTable( owner, table_noid_nogeom, false, false, false );
 
+
         owner->Commit();
 
         connection = UnitTestUtil::CreateConnection(
@@ -1854,19 +1856,23 @@
         // Select and verify all data (post-update state).
 
         SelectNoMetaAll( connection, phMgr, table_id_geom, m_hasGeom, m_hasAssoc );
+        SelectNoMetaAll( connection, phMgr, L"VIEW_ID_GEOM", m_hasGeom, false );
         SelectNoMetaAll( connection, phMgr, L"TABLE_NOID_GEOM", m_hasGeom, false );
         SelectNoMetaAll( connection, phMgr, table_noid_nogeom, false, false );
 
         SelectNoMetaFilter( connection, phMgr, table_id_geom, m_hasGeom, m_hasAssoc );
+        SelectNoMetaFilter( connection, phMgr, L"VIEW_ID_GEOM", m_hasGeom, false );
         SelectNoMetaFilter( connection, phMgr, L"TABLE_NOID_GEOM", m_hasGeom, false );
         SelectNoMetaFilter( connection, phMgr, table_noid_nogeom, false, false );
 
         SelectNoMetaProps( connection, phMgr, table_id_geom, m_hasGeom );
+        SelectNoMetaProps( connection, phMgr, L"VIEW_ID_GEOM", m_hasGeom );
         SelectNoMetaProps( connection, phMgr, L"TABLE_NOID_GEOM", m_hasGeom );
         SelectNoMetaProps( connection, phMgr, table_noid_nogeom, false );
 
 #ifndef RDBI_DEF_SSQL
 		SelectNoMetaSpatial( connection, phMgr, table_id_geom, m_hasAssoc );
+		SelectNoMetaSpatial( connection, phMgr, L"VIEW_ID_GEOM", false );
 		SelectNoMetaSpatial( connection, phMgr, L"TABLE_NOID_GEOM", false );
 #endif
 
@@ -1942,6 +1948,27 @@
     }
 }
 
+void FdoUpdateTest::CreateExternalView( FdoSmPhOwnerP owner, FdoStringP viewName, FdoStringP tableName, bool hasKey, bool hasGeom, bool hasAssoc )
+{
+    FdoSmPhMgrP phMgr = owner->GetManager();
+
+    FdoSmPhViewP view = owner->CreateView( phMgr->GetDcDbObjectName(viewName), L"", owner->GetName(), phMgr->GetDcDbObjectName(tableName) );
+    
+    FdoStringP columnName = phMgr->GetDcColumnName(L"KEY1");
+    FdoSmPhColumnP column = view->CreateColumnChar( columnName, false, 10, columnName );
+    
+    columnName = phMgr->GetDcColumnName(Key2ColName());
+    FdoSmPhColumnP fkColumn = view->CreateColumnChar( columnName, false, 10, columnName );
+
+    if ( hasGeom ) {
+        columnName = phMgr->GetDcColumnName(L"GEOMETRY");
+        column = view->CreateColumnGeom( columnName, (FdoSmPhScInfo*) NULL, true, false, false, columnName );
+    }
+
+    columnName = phMgr->GetDcColumnName(ValueColName());
+    column = view->CreateColumnChar( columnName, true, 20, columnName );
+}
+
 void FdoUpdateTest::CreateExternalData( FdoPtr<FdoIConnection> connection, FdoSmPhMgrP phMgr, FdoStringP tableName, bool hasGeom, bool hasAssoc )
 {
 

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.h
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.h	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/Common/FdoUpdateTest.h	2007-02-15 21:34:40 UTC (rev 2547)
@@ -59,6 +59,7 @@
     virtual void  set_provider() {};   
 
     void CreateExternalTable( FdoSmPhOwnerP owner, FdoStringP tableName, bool hasKey, bool hasGeom, bool hasAssoc );
+    void CreateExternalView( FdoSmPhOwnerP owner, FdoStringP viewName, FdoStringP tableName, bool hasKey, bool hasGeom, bool hasAssoc );
     void CreateExternalData( FdoPtr<FdoIConnection> connection, FdoSmPhMgrP phMgr, FdoStringP tableName, bool hasGeom, bool hasAssoc );
     void SelectNoMetaAll( FdoPtr<FdoIConnection> connection, FdoSmPhMgrP phMgr, FdoStringP tableName, bool hasGeom, bool hasAssoc );
     void SelectNoMetaFilter( FdoPtr<FdoIConnection> connection, FdoSmPhMgrP phMgr, FdoStringP tableName, bool hasGeom, bool hasAssoc );

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalBender.xslt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalBender.xslt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalBender.xslt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -10,9 +10,9 @@
 >
 
 <xsl:param name="providerName"/>
-<xsl:template match="lp:schema[@name='F_MetaClass' or starts-with(@name,'abcdef1234567890')]"/>
+<xsl:template match="lp:schema[@name='F_MetaClass' or (not($providerName='Oracle') and starts-with(@name,'abcdef1234567890'))]"/>
 <xsl:template match="lp:class[@name='aCxdATA' and $providerName='SqlServer']"/>
-<xsl:template match="lp:class[@name='Zoning' and ($providerName='SqlServer' or $providerName='MySql')]">
+<xsl:template match="lp:class[@name='Zoning']">
   <xsl:copy>
     <xsl:apply-templates select="@*"/>
     <xsl:apply-templates select="lp:tableMapping|lp:identityProperties|lp:properties"/>
@@ -39,7 +39,12 @@
 			</xsl:variable>
 			<xsl:element name="column">
 				<xsl:attribute name="name">
-					<xsl:value-of select="concat($upperName,'_SI_1')"/>
+					<xsl:choose>
+						<xsl:when test="string-length(substring-after($upperName,'GEOMETRY')) = 1">GEOMETRY__SI_1</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat($upperName,'_SI_1')"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:attribute>
 				<xsl:attribute name="description"/>
 				<xsl:attribute name="dataType">VARCHAR</xsl:attribute>
@@ -49,7 +54,12 @@
 			</xsl:element>
 			<xsl:element name="column">
 				<xsl:attribute name="name">
-					<xsl:value-of select="concat($upperName,'_SI_2')"/>
+					<xsl:choose>
+						<xsl:when test="string-length(substring-after($upperName,'GEOMETRY')) = 1">GEOMETRY__SI_2</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="concat($upperName,'_SI_2')"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:attribute>
 				<xsl:attribute name="description"/>
 				<xsl:attribute name="dataType">VARCHAR</xsl:attribute>
@@ -240,7 +250,8 @@
 									<xsl:attribute name="dataType">DOUBLE</xsl:attribute>	
 								</xsl:when>
 								<xsl:when test="$providerName = 'SqlServer'">
-									<xsl:attribute name="dataType">REAL</xsl:attribute>	
+									<!-- logged as defect 772006 <xsl:attribute name="dataType">REAL</xsl:attribute>	-->
+									<xsl:attribute name="dataType">FLOAT</xsl:attribute>
 								</xsl:when>
 							</xsl:choose>
 							<xsl:attribute name="length">0</xsl:attribute>	
@@ -288,7 +299,7 @@
 </xsl:template>
 <xsl:template match="@tableName">
 	<xsl:attribute name="tableName">
-		<xsl:call-template name="bendTableName">
+		<xsl:call-template name="prefixTableName">
 			<xsl:with-param name="inName" select="."/>
 		</xsl:call-template>
 	</xsl:attribute>
@@ -316,7 +327,7 @@
 </xsl:template>
 <xsl:template match="@name[local-name(..)='table']">
 	<xsl:attribute name="name">
-		<xsl:call-template name="bendTableName">
+		<xsl:call-template name="prefixTableName">
 			<xsl:with-param name="inName" select="."/>
 		</xsl:call-template>
 	</xsl:attribute>
@@ -345,9 +356,26 @@
 	<xsl:choose>
 		<xsl:when test="$providerName='Oracle'">
 			<xsl:choose>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX1'">ACDBHATCH_POLYLINE_AC1_ACDB1</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX2'">ACDBHATCH_POLYLINE_AC1_SEQ</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA1'">ACDB3DPOLYLINE_ACDBVE1_ACDB1</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA2'">ACDB3DPOLYLINE_ACDBVE1_SEQ</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_1'">ELECTRICDEVICE_MAINT_1_ELEC1</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_2'">ELECTRICDEVICE_MAINT_1_DATE1</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE_F1'">EMPLOYEE_A_ADDRESS_EMPLOYEE1</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE_L1'">EMPLOYEE_A_ADDRESS_EMPLOYEE2</xsl:when>
+				<xsl:when test="$inName='MAINTENANCE_HISTORY_DESCRIPTI1'">MAINTENANCE_HISTORY_DESCRIP1</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE_HD_OVCL1'">OVCLASSC111_OPC_TABLE1_OVCL1</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE_HD_OPID1'">OVCLASSC111_OPC_TABLE1_OPID1</xsl:when>
 				<xsl:when test="$inName='OVCLASSH_FTABLED_OVCLASSH_FEA1'">OVCLASSH_FTABLED_OVCLASSH_F1</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_SEQ'">POLYLINE_ACDBVERTEXDA1_SEQ</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_POLYL1'">POLYLINE_ACDBVERTEXDA1_POLY1</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345671'">ABCDEF1234567890ABCDEF123451</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345672' and ../@tableName='ABCDEF1234567890ABCDEF12345675'">ABCDEF1234567890ABCDE4_ABCD1</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345672' and ../@tableName='ABCDEF1234567890ABCDEF12345673'">ABCDEF1234567890ABCDE2_ABCD1</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345672'">ABCDEF1234567890ABCDE1_ABCD1</xsl:when>
+				<!--<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345672'"><xsl:value-of select="../@tableName"/></xsl:when>-->
+				<xsl:when test="$inName='GBCDEF1234567890ABCDEF12345671'">GBCDEF1234567890ABCDEF123451</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="$inName"/>
 				</xsl:otherwise>
@@ -355,16 +383,17 @@
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:choose>
-				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA1'">acdb3dpolyline_acdbvertexdata_acdb3dpolyline_featid</xsl:when>
-				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA2'">acdb3dpolyline_acdbvertexdata_seq</xsl:when>
-				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX1'">acdbhatch_polyline_acdbvertexdata_acdbhatch_polyline_featid</xsl:when>
-				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX2'">acdbhatch_polyline_acdbvertexdata_seq</xsl:when>
-				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_POLYL1'">polyline_acdbvertexdata_polyline_featid</xsl:when>
-				<xsl:when test="$inName='MAINTENANCE_HISTORY_DESCRIPTI1'">maintenance_history_description</xsl:when>
-				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_1'">electricdevice_maint_history_electricdevice_featid</xsl:when>
-				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_2'">electricdevice_maint_history_date1</xsl:when>
-				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE_F1'">employee_a_address_employee_first_name</xsl:when>
-				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE_L1'">employee_a_address_employee_last_name</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVE1_ACDB1'">acdb3dpolyline_acdbvertexdata_acdb3dpolyline_featid</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVE1_SEQ'">acdb3dpolyline_acdbvertexdata_seq</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC1_ACDB1'">acdbhatch_polyline_acdbvertexdata_acdbhatch_polyline_featid</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC1_SEQ'">acdbhatch_polyline_acdbvertexdata_seq</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDA1_POLY1'">polyline_acdbvertexdata_polyline_featid</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDA1_SEQ'">polyline_acdbvertexdata_seq</xsl:when>
+				<xsl:when test="$inName='MAINTENANCE_HISTORY_DESCRIP1'">maintenance_history_description</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_1_ELEC1'">electricdevice_maint_history_electricdevice_featid</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_1_DATE1'">electricdevice_maint_history_date1</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE1'">employee_a_address_employee_first_name</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_EMPLOYEE2'">employee_a_address_employee_last_name</xsl:when>
 				<xsl:when test="$inName='REFIXA_PREFIXA_PREFIXA_OPA'">prefixa_prefixa_prefixa_opa</xsl:when>
 				<xsl:when test="$inName='REFIXA_PREFIXA_PREFIXA_OPB'">prefixa_prefixa_prefixa_opb</xsl:when>
 				<xsl:when test="$inName='BJECTA_PREFIXA_PREFIXA_OPA'">objecta_prefixa_prefixa_opa</xsl:when>
@@ -389,6 +418,20 @@
 		</xsl:otherwise>
 	</xsl:choose>
   </xsl:template>
+  <xsl:template name="prefixTableName">
+	<xsl:param name="inName"/>
+	<xsl:variable name="prefix">
+		<xsl:choose>
+			<xsl:when test="$providerName='SqlServer'">dbo.</xsl:when>
+		</xsl:choose>
+	</xsl:variable>
+	<xsl:variable name="bentName">
+		<xsl:call-template name="bendTableName">
+			<xsl:with-param name="inName" select="$inName"/>
+		</xsl:call-template>
+	</xsl:variable>
+	<xsl:value-of select="concat($prefix,$bentName)"/>
+  </xsl:template>
   <xsl:template name="bendTableName">
 	<xsl:param name="inName"/>
 	<xsl:choose>
@@ -397,6 +440,33 @@
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE_HD'">OVCLASSC111_OPC_TABLE1</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE_HD_OPC_1'">OVCLASSC111_OPC_TABLE2</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPS_TABLE_HA'">OVCLASSC111_OPS_TABLE1</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA'">ACDB3DPOLYLINE_ACDBVE1</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA1'">ACDB3DPOLYLINE_ACDBVE2</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA2'">ACDB3DPOLYLINE_ACDBVE3</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX1'">ACDBHATCH_POLYLINE_AC1</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX2'">ACDBHATCH_POLYLINE_AC2</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX3'">ACDBHATCH_POLYLINE_AC3</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACXDATA'">ACDBHATCH_POLYLINE_AC4</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXCOORDINATEVALUE'">ACDBVERTEXCOORDINATEV1</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVERTEXCOOR1'">ACDBVERTEXDATA_ACDBVE1</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVERTEXCOOR2'">ACDBVERTEXDATA_ACDBVE2</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_ENTITY_ACXDATA'">ELECTRICDEVICE_ENTITY1</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY'">ELECTRICDEVICE_MAINT_1</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_1'">ELECTRICDEVICE_MAINT_2</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_STREET'">EMPLOYEE_A_ADDRESS_ST1</xsl:when>
+				<xsl:when test="$inName='MAINT_HISTORY_MAINT_HISTORY_I1'">MAINT_HISTORY_MAINT_H1</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA'">POLYLINE_ACDBVERTEXDA1</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_ACDBV1'">POLYLINE_ACDBVERTEXDA2</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_ACDBV2'">POLYLINE_ACDBVERTEXDA3</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345671'">ABCDEF1234567890ABCDE1</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345672'">ABCDEF1234567890ABCDE2</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345673'">ABCDEF1234567890ABCDE3</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345674'">ABCDEF1234567890ABCDE4</xsl:when>
+				<xsl:when test="$inName='ABCDEF1234567890ABCDEF12345675'">ABCDEF1234567890ABCDE5</xsl:when>
+				<xsl:when test="$inName='BBCDEF1234567890ABCDEF12345671'">BBCDEF1234567890ABCDE1</xsl:when>
+				<xsl:when test="$inName='OACDEF1234567890ABCDEF12345671'">OACDEF1234567890ABCDE1</xsl:when>
+				<xsl:when test="$inName='OBCDEF1234567890ABCDEF12345671'">OBCDEF1234567890ABCDE1</xsl:when>
+				<xsl:when test="$inName='OBCDEF1234567890ABCDEF12345672'">OBCDEF1234567890ABCDE2</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="$inName"/>
 				</xsl:otherwise>
@@ -404,17 +474,24 @@
 		</xsl:when>
 		<xsl:otherwise>
 			<xsl:choose>
-				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA1'">acdb3dpolyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
-				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVERTEXDATA2'">acdb3dpolyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
-				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX1'">acdbhatch_polyline_acdbvertexdata</xsl:when>
-				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX2'">acdbhatch_polyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
-				<xsl:when test="$inName='ACDBHATCH_POLYLINE_ACDBVERTEX3'">acdbhatch_polyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
-				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVERTEXCOOR1'">acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
-				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVERTEXCOOR2'">acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
-				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_ACDBV1'">polyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
-				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDATA_ACDBV2'">polyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
-				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_HISTORY_1'">electricdevice_maint_history_maint_history_item</xsl:when>
-				<xsl:when test="$inName='MAINT_HISTORY_MAINT_HISTORY_I1'">maint_history_maint_history_item</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVE1'">acdb3dpolyline_acdbvertexdata</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVE2'">acdb3dpolyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
+				<xsl:when test="$inName='ACDB3DPOLYLINE_ACDBVE3'">acdb3dpolyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC1'">acdbhatch_polyline_acdbvertexdata</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC2'">acdbhatch_polyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC4'">acdbhatch_polyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
+				<xsl:when test="$inName='ACDBHATCH_POLYLINE_AC3'">acdbhatch_polyline_acxdata</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXCOORDINATEV1'">acdbvertexcoordinatevalue</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVE1'">acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
+				<xsl:when test="$inName='ACDBVERTEXDATA_ACDBVE2'">acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_ENTITY1'">electricdevice_entity_acxdata</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_1'">electricdevice_maint_history</xsl:when>
+				<xsl:when test="$inName='ELECTRICDEVICE_MAINT_2'">electricdevice_maint_history_maint_history_item</xsl:when>
+				<xsl:when test="$inName='EMPLOYEE_A_ADDRESS_ST1'">employee_a_address_street</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDA1'">polyline_acdbvertexdata</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDA2'">polyline_acdbvertexdata_acdbvertexcoordinatevalue</xsl:when>
+				<xsl:when test="$inName='POLYLINE_ACDBVERTEXDA3'">polyline_acdbvertexdata_acdbvertexcoordinatevalue1</xsl:when>
+				<xsl:when test="$inName='MAINT_HISTORY_MAINT_H1'">maint_history_maint_history_item</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE1'">ovclassc111_opc_table_hd</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPC_TABLE2'">ovclassc111_opc_table_hd_opc_table_hda</xsl:when>
 				<xsl:when test="$inName='OVCLASSC111_OPS_TABLE1'">ovclassc111_ops_table_ha</xsl:when>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalFormatter.xslt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalFormatter.xslt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/LogicalPhysicalFormatter.xslt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -14,7 +14,7 @@
 </xsl:template>
 <xsl:template match="lp:column[@dataType and not(@name = 'classname' or @name = 'schemaname' or @name = 'CLASSNAME' or @name = 'SCHEMANAME')]">
 	<xsl:variable name="colName" select="@name"/>
-   <xsl:if test="local-name(..)='property' or ../../lp:properties/lp:property[@columnName=$colName or translate(@name,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')=substring-before($colName,'_SI_1') or translate(@name,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')=substring-before($colName,'_SI_2')]">
+   <xsl:if test="local-name(..)='property' or ../../lp:properties/lp:property[@columnName=$colName or contains($colName,'_SI_1') or contains($colName,'_SI_2')]">
 		<xsl:element name="column">
 			<xsl:attribute name="name">
 				<xsl:value-of select="@name"/>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test1_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test1_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test1_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -78,7 +78,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -88,7 +88,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -109,7 +109,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -120,29 +120,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -162,9 +162,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -177,8 +177,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -193,15 +193,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -214,8 +214,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -232,7 +232,7 @@
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDB3DPOLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -253,7 +253,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -276,7 +276,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -789,7 +789,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -799,7 +799,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -820,7 +820,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -831,29 +831,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -873,9 +873,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -898,8 +898,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -914,15 +914,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -945,8 +945,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -963,7 +963,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -984,7 +984,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1017,7 +1017,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1060,7 +1060,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1070,21 +1070,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1105,7 +1105,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1137,7 +1137,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1416,7 +1416,7 @@
 </class>
 <class xsi:type="Class" name="AcDbVertexCoordinateValue" description=""
  baseClass="" abstract="False"
- tableName="ACDBVERTEXCOORDINATEVALUE" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXCOORDINATEV1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -1424,12 +1424,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1474,7 +1474,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1483,12 +1483,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1792,7 +1792,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1802,7 +1802,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -1823,7 +1823,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1834,29 +1834,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1876,9 +1876,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -1891,8 +1891,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -1907,15 +1907,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -1928,8 +1928,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -1946,7 +1946,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1967,7 +1967,7 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -1990,7 +1990,7 @@
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2367,7 +2367,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -2377,7 +2377,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2385,7 +2385,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -2393,7 +2393,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -2415,9 +2415,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2447,9 +2447,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2500,7 +2500,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2529,7 +2529,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2563,7 +2563,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -2573,7 +2573,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -2581,9 +2581,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -2604,7 +2604,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -2615,7 +2615,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -2623,7 +2623,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -2631,7 +2631,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2639,7 +2639,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -2647,17 +2647,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2677,9 +2677,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2692,8 +2692,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -2714,15 +2714,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2735,8 +2735,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -2753,7 +2753,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -2775,7 +2775,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2795,13 +2795,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3075,7 +3075,7 @@
 </column>
 </property>
 </properties>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 <property xsi:type="Data" name="Credit Rating" />
 <property xsi:type="Data" name="First Name" />
 <property xsi:type="Data" name="Last Name" />
@@ -3087,7 +3087,7 @@
 </column>
 </table>
 <tables>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 </table>
@@ -3206,7 +3206,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3216,21 +3216,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3251,9 +3251,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3283,9 +3283,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3335,7 +3335,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3364,7 +3364,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3397,7 +3397,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3407,15 +3407,15 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="True" fixedCol="False"  >
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="True" fixedCol="False"  >
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="True" fixedCol="False"  >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -3435,7 +3435,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3446,43 +3446,43 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="True" fixedCol="False"  >
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="True" fixedCol="False"  >
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -3502,9 +3502,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3517,8 +3517,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3539,15 +3539,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3560,8 +3560,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3578,7 +3578,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3599,7 +3599,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3619,13 +3619,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3778,7 +3778,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Employee.home' address.street" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="EMPLOYEE_A_ADDRESS_STREET" tblCreator="True" fixedTbl="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Employee_First Name" />
@@ -3788,29 +3788,29 @@
 <property xsi:type="Data" name="Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="NAME" colCreator="True" fixedCol="False"  >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="NAME" colCreator="True" fixedCol="False"  >
 <column name="NAME" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Type" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="TYPE" colCreator="True" fixedCol="False"  >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="TYPE" colCreator="True" fixedCol="False"  >
 <column name="TYPE" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Employee_First Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" colCreator="True" fixedCol="False"  >
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE1" colCreator="True" fixedCol="False"  >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Employee_Last Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" colCreator="True" fixedCol="False"  >
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE2" colCreator="True" fixedCol="False"  >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -3830,7 +3830,7 @@
 </column>
 </property>
 </properties>
-<table name="EMPLOYEE_A_ADDRESS_STREET" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS_STREET" >
+<table name="EMPLOYEE_A_ADDRESS_ST1" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS1" >
 <target>
 <table name="EMPLOYEE_A_ADDRESS" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS" >
 <target>
@@ -3847,8 +3847,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" />
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" />
 </sourceColumns>
 <targetColumns>
 <column name="EMPLOYEE_FIRST_NAME" />
@@ -3863,13 +3863,13 @@
 </column>
 <column name="TYPE" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="EMPLOYEE_A_ADDRESS_STREET" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS_STREET" >
+<table name="EMPLOYEE_A_ADDRESS_ST1" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS1" >
 <target>
 <table name="EMPLOYEE_A_ADDRESS" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS" >
 <target>
@@ -3886,8 +3886,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" />
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" />
 </sourceColumns>
 <targetColumns>
 <column name="EMPLOYEE_FIRST_NAME" />
@@ -4031,7 +4031,7 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
  objectType="Ordered Collection" className="Electric'l:Maint History Item" idColumn="IT_M__" order="descending"
@@ -4046,7 +4046,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Maint History.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" tblCreator="False" fixedTbl="False" >
+ tableName="MAINT_HISTORY_MAINT_H1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="It'm #" />
@@ -4055,22 +4055,22 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="PART__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -4453,7 +4453,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -4463,7 +4463,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -4471,7 +4471,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -4479,7 +4479,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -4501,9 +4501,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4533,9 +4533,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4586,7 +4586,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4615,7 +4615,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4649,7 +4649,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4659,7 +4659,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -4667,9 +4667,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -4690,7 +4690,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4701,7 +4701,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -4709,7 +4709,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -4717,7 +4717,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -4725,7 +4725,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -4733,17 +4733,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -4763,9 +4763,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4778,8 +4778,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4800,15 +4800,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4821,8 +4821,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4839,7 +4839,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -4861,7 +4861,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4881,13 +4881,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -6109,6 +6109,11 @@
 </column>
 </property>
 </properties>
+<uniqueConstraints>
+<uniqueConstraint>
+<property xsi:type="Data" name="PolyNum" />
+</uniqueConstraint>
+</uniqueConstraints>
 <table name="ZONING" description="" pkeyName="PK_ZONING" >
 <property xsi:type="Data" name="Authority" />
 <property xsi:type="Data" name="ByLaw" />

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test2_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test2_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test2_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -78,7 +78,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -88,7 +88,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -109,7 +109,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -120,29 +120,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -162,9 +162,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -177,8 +177,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -193,15 +193,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -214,8 +214,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -246,7 +246,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -257,29 +257,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -299,9 +299,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -314,8 +314,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -330,15 +330,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -351,8 +351,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -369,7 +369,7 @@
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDB3DPOLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -390,7 +390,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -417,7 +417,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -930,7 +930,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -940,7 +940,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -961,7 +961,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -972,29 +972,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1014,9 +1014,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1039,8 +1039,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1055,15 +1055,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1086,8 +1086,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1118,7 +1118,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1129,29 +1129,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1171,9 +1171,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1196,8 +1196,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1212,15 +1212,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1243,8 +1243,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1261,7 +1261,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1282,7 +1282,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1319,7 +1319,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1362,7 +1362,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1372,21 +1372,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1407,7 +1407,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1439,7 +1439,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1718,7 +1718,7 @@
 </class>
 <class xsi:type="Class" name="AcDbVertexCoordinateValue" description=""
  baseClass="" abstract="False"
- tableName="ACDBVERTEXCOORDINATEVALUE" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXCOORDINATEV1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -1726,12 +1726,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1776,7 +1776,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1785,12 +1785,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1825,7 +1825,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1834,12 +1834,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -2143,7 +2143,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2153,7 +2153,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -2174,7 +2174,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2185,29 +2185,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2227,9 +2227,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2242,8 +2242,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2258,15 +2258,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2279,8 +2279,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2311,7 +2311,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2322,29 +2322,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2364,9 +2364,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2379,8 +2379,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2395,15 +2395,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2416,8 +2416,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2434,7 +2434,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -2455,7 +2455,7 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2482,7 +2482,7 @@
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2837,7 +2837,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -2847,7 +2847,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2855,7 +2855,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -2863,7 +2863,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -2885,9 +2885,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2917,9 +2917,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2970,7 +2970,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2999,7 +2999,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3266,7 +3266,7 @@
 </column>
 </property>
 </properties>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 <property xsi:type="Data" name="Credit Rating" />
 <property xsi:type="Data" name="First Name" />
 <property xsi:type="Data" name="Last Name" />
@@ -3278,7 +3278,7 @@
 </column>
 </table>
 <tables>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 </table>
@@ -3390,7 +3390,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3400,21 +3400,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3435,9 +3435,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3467,9 +3467,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3519,7 +3519,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3548,7 +3548,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3644,7 +3644,7 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
  objectType="Ordered Collection" className="Electric'l:Maint History Item" idColumn="IT_M__" order="descending"
@@ -3659,7 +3659,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Maint History.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" tblCreator="False" fixedTbl="False" >
+ tableName="MAINT_HISTORY_MAINT_H1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="It'm #" />
@@ -3668,22 +3668,22 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="PART__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -3923,7 +3923,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3933,7 +3933,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -3941,7 +3941,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -3949,7 +3949,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -3971,9 +3971,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4003,9 +4003,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4056,7 +4056,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4085,7 +4085,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test3_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test3_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test3_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -78,7 +78,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -88,7 +88,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -109,7 +109,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -120,29 +120,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -162,9 +162,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -177,8 +177,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -193,15 +193,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -214,8 +214,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -246,7 +246,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -257,29 +257,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -299,9 +299,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -314,8 +314,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -330,15 +330,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -351,8 +351,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -369,7 +369,7 @@
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDB3DPOLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -390,7 +390,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -417,7 +417,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -930,7 +930,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -940,7 +940,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -961,7 +961,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -972,29 +972,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1014,9 +1014,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1039,8 +1039,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1055,15 +1055,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1086,8 +1086,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1118,7 +1118,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1129,29 +1129,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1171,9 +1171,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1196,8 +1196,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1212,15 +1212,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1243,8 +1243,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1261,7 +1261,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1282,7 +1282,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1319,7 +1319,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1362,7 +1362,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1372,21 +1372,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1407,7 +1407,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1439,7 +1439,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1718,7 +1718,7 @@
 </class>
 <class xsi:type="Class" name="AcDbVertexCoordinateValue" description=""
  baseClass="" abstract="False"
- tableName="ACDBVERTEXCOORDINATEVALUE" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXCOORDINATEV1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -1726,12 +1726,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1776,7 +1776,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1785,12 +1785,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1825,7 +1825,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1834,12 +1834,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -2143,7 +2143,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2153,7 +2153,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -2174,7 +2174,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2185,29 +2185,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2227,9 +2227,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2242,8 +2242,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2258,15 +2258,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2279,8 +2279,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2311,7 +2311,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2322,29 +2322,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2364,9 +2364,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2379,8 +2379,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2395,15 +2395,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2416,8 +2416,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2434,7 +2434,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -2455,7 +2455,7 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2482,7 +2482,7 @@
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2837,7 +2837,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -2847,7 +2847,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2855,7 +2855,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -2863,7 +2863,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -2885,9 +2885,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2917,9 +2917,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2970,7 +2970,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2999,7 +2999,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3033,7 +3033,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3043,7 +3043,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -3051,9 +3051,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -3074,7 +3074,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3085,7 +3085,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -3093,7 +3093,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -3101,7 +3101,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -3109,7 +3109,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -3117,17 +3117,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -3147,9 +3147,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3162,8 +3162,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3184,15 +3184,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3205,8 +3205,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3223,7 +3223,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -3245,7 +3245,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3265,13 +3265,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3542,7 +3542,7 @@
 </column>
 </property>
 </properties>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 <property xsi:type="Data" name="Credit Rating" />
 <property xsi:type="Data" name="First Name" />
 <property xsi:type="Data" name="Last Name" />
@@ -3554,7 +3554,7 @@
 </column>
 </table>
 <tables>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 </table>
@@ -3666,7 +3666,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3676,21 +3676,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3711,9 +3711,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3743,9 +3743,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3795,7 +3795,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3824,7 +3824,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3857,7 +3857,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3867,15 +3867,15 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="True" fixedCol="False"  >
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="True" fixedCol="False"  >
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="True" fixedCol="False"  >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -3895,7 +3895,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3906,43 +3906,43 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="True" fixedCol="False"  >
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="True" fixedCol="False"  >
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -3962,9 +3962,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3977,8 +3977,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3999,15 +3999,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4020,8 +4020,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4038,7 +4038,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -4059,7 +4059,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4079,13 +4079,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4185,7 +4185,7 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
  objectType="Ordered Collection" className="Electric'l:Maint History Item" idColumn="IT_M__" order="descending"
@@ -4200,7 +4200,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Maint History.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" tblCreator="False" fixedTbl="False" >
+ tableName="MAINT_HISTORY_MAINT_H1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="It'm #" />
@@ -4209,22 +4209,22 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="PART__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -4603,7 +4603,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -4613,7 +4613,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -4621,7 +4621,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -4629,7 +4629,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -4651,9 +4651,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4683,9 +4683,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4736,7 +4736,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4765,7 +4765,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4799,7 +4799,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4809,7 +4809,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -4817,9 +4817,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -4840,7 +4840,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4851,7 +4851,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -4859,7 +4859,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -4867,7 +4867,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -4875,7 +4875,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -4883,17 +4883,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -4913,9 +4913,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4928,8 +4928,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4950,15 +4950,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4971,8 +4971,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4989,7 +4989,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -5011,7 +5011,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5031,13 +5031,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -6260,6 +6260,11 @@
 </column>
 </property>
 </properties>
+<uniqueConstraints>
+<uniqueConstraint>
+<property xsi:type="Data" name="PolyNum" />
+</uniqueConstraint>
+</uniqueConstraints>
 <table name="ZONING" description="" pkeyName="PK_ZONING" >
 <property xsi:type="Data" name="Authority" />
 <property xsi:type="Data" name="ByLaw" />
@@ -6304,7 +6309,7 @@
 <schema name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" >
 <class xsi:type="Feature" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345671" tblCreator="True" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE1" tblCreator="True" fixedTbl="False" >
 <geometryProperty>gbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789</geometryProperty>
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
@@ -6314,7 +6319,7 @@
 <property xsi:type="Data" name="ClassId" description="Class id number (uniquely identifies a class)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="True" featId="False" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="CLASSID" colCreator="True" fixedCol="True"  >
+ tableName="ABCDEF1234567890ABCDE1" columnName="CLASSID" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="CLASSID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -6322,7 +6327,7 @@
 <property xsi:type="Data" name="FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="True" featId="True" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="FEATID" colCreator="True" fixedCol="True"  >
+ tableName="ABCDEF1234567890ABCDE1" columnName="FEATID" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -6330,7 +6335,7 @@
 <property xsi:type="Data" name="RevisionNumber" description="Edit count for supporting optimistic locking.  This value is incremented everytime the object is updated."
  dataType="double" length="0" precision="0" scale="0"
  readOnly="True" featId="False" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="REVISIONNUMBER" colCreator="True" fixedCol="True"  >
+ tableName="ABCDEF1234567890ABCDE1" columnName="REVISIONNUMBER" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="REVISIONNUMBER" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
@@ -6338,8 +6343,8 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE1" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 <SAD>
 <element name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" value="12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012the-end" />
@@ -6357,7 +6362,7 @@
 </targetProperties>
 <class xsi:type="Class" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345674" tblCreator="True" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE4" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6366,8 +6371,8 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345674" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE4" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Object" name="cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
@@ -6382,7 +6387,7 @@
 </targetProperties>
 <class xsi:type="Class" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345675" tblCreator="True" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE5" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6391,15 +6396,15 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345675" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE5" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345675" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE5" columnName="ABCDEF1234567890ABCDE4_ABCD1" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDE4_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6419,54 +6424,54 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345675" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12341" >
+<table name="ABCDEF1234567890ABCDE5" description="" pkeyName="PK_ABCDEF1234567890AB1" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE4_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE4_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345675" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12341" >
+<table name="ABCDEF1234567890ABCDE5" description="" pkeyName="PK_ABCDEF1234567890AB1" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE4_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 </table>
@@ -6479,8 +6484,8 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345674" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE4" columnName="ABCDEF1234567890ABCDE1_ABCD1" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6500,15 +6505,15 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6517,21 +6522,21 @@
  fixedCol="False" >
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
@@ -6553,7 +6558,7 @@
 </targetProperties>
 <class xsi:type="Class" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345672" tblCreator="True" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6562,8 +6567,8 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345672" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE2" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Object" name="cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
@@ -6578,7 +6583,7 @@
 </targetProperties>
 <class xsi:type="Class" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345673" tblCreator="True" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6587,15 +6592,15 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345673" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE3" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345673" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE3" columnName="ABCDEF1234567890ABCDE2_ABCD1" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDE2_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6615,54 +6620,54 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345673" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12343" >
+<table name="ABCDEF1234567890ABCDE3" description="" pkeyName="PK_ABCDEF1234567890AB3" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE2_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE2_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345673" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12343" >
+<table name="ABCDEF1234567890ABCDE3" description="" pkeyName="PK_ABCDEF1234567890AB3" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE2_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 </table>
@@ -6675,8 +6680,8 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345672" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="True" fixedCol="False"  >
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+ tableName="ABCDEF1234567890ABCDE2" columnName="ABCDEF1234567890ABCDE1_ABCD1" colCreator="True" fixedCol="False"  >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6696,15 +6701,15 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6713,21 +6718,21 @@
  fixedCol="False" >
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
@@ -6739,20 +6744,20 @@
 </property>
 <property xsi:type="Geometric" name="gbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
 geometricTypes="3" geometryTypes="42688" hasElevation="False" hasMeasure="False"
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="GBCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False" >
-<column name="GBCDEF1234567890ABCDEF12345671" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
+ tableName="ABCDEF1234567890ABCDE1" columnName="GBCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False" >
+<column name="GBCDEF1234567890ABCDEF123451" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="n/a" description=""
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="N_A" colCreator="True" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE1" columnName="N_A" colCreator="True" fixedCol="False"  >
 <column name="N_A" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Geometric" name="Bounds" description="Bounding box for the feature"
 geometricTypes="4" geometryTypes="84224" hasElevation="False" hasMeasure="False"
- tableName="ABCDEF1234567890ABCDEF12345671" columnName="n/a" colCreator="False" fixedCol="False" >
+ tableName="ABCDEF1234567890ABCDE1" columnName="n/a" colCreator="False" fixedCol="False" >
 <Inherited baseClass="Feature" />
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6772,7 +6777,7 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 <property xsi:type="Data" name="ClassId" />
 <property xsi:type="Data" name="FeatId" />
 <property xsi:type="Data" name="RevisionNumber" />
@@ -6793,19 +6798,19 @@
 </column>
 <column name="REVISIONNUMBER" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="GBCDEF1234567890ABCDEF12345671" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
+<column name="GBCDEF1234567890ABCDEF123451" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
 </column>
 <column name="N_A" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12345" >
+<table name="ABCDEF1234567890ABCDE1" description="" pkeyName="PK_ABCDEF1234567890AB5" >
 </table>
 <sourceColumns>
 <column name="CLASSID" />
@@ -6819,7 +6824,7 @@
 </class>
 <class xsi:type="Feature" name="bbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" abstract="False"
- tableName="BBCDEF1234567890ABCDEF12345671" tblCreator="True" fixedTbl="False" >
+ tableName="BBCDEF1234567890ABCDE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6828,7 +6833,7 @@
 <property xsi:type="Data" name="ClassId" description="Class id number (uniquely identifies a class)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="True" featId="False" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="CLASSID" colCreator="True" fixedCol="True"  >
+ tableName="BBCDEF1234567890ABCDE1" columnName="CLASSID" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="CLASSID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -6836,7 +6841,7 @@
 <property xsi:type="Data" name="FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="True" featId="True" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="FEATID" colCreator="True" fixedCol="True"  >
+ tableName="BBCDEF1234567890ABCDE1" columnName="FEATID" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -6844,7 +6849,7 @@
 <property xsi:type="Data" name="RevisionNumber" description="Edit count for supporting optimistic locking.  This value is incremented everytime the object is updated."
  dataType="double" length="0" precision="0" scale="0"
  readOnly="True" featId="False" system="True" nullable="False" autogenerated="True" defaultValue=""
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="REVISIONNUMBER" colCreator="True" fixedCol="True"  >
+ tableName="BBCDEF1234567890ABCDE1" columnName="REVISIONNUMBER" colCreator="True" fixedCol="True"  >
 <Inherited baseClass="Feature" />
 <column name="REVISIONNUMBER" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
@@ -6852,22 +6857,22 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False"  >
+ tableName="BBCDEF1234567890ABCDE1" columnName="ABCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Geometric" name="gbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
 geometricTypes="3" geometryTypes="42688" hasElevation="False" hasMeasure="False"
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="GBCDEF1234567890ABCDEF12345671" colCreator="True" fixedCol="False" >
+ tableName="BBCDEF1234567890ABCDE1" columnName="GBCDEF1234567890ABCDEF123451" colCreator="True" fixedCol="False" >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="GBCDEF1234567890ABCDEF12345671" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
+<column name="GBCDEF1234567890ABCDEF123451" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="n/a" description=""
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="N_A" colCreator="True" fixedCol="False"  >
+ tableName="BBCDEF1234567890ABCDE1" columnName="N_A" colCreator="True" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
 <column name="N_A" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
@@ -6885,7 +6890,7 @@
 </targetProperties>
 <class xsi:type="Class" name="bbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345674" tblCreator="False" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE4" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6894,9 +6899,9 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345674" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE4" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Object" name="cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
@@ -6912,7 +6917,7 @@
 </targetProperties>
 <class xsi:type="Class" name="bbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345675" tblCreator="False" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE5" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -6921,17 +6926,17 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345675" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE5" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345675" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE5" columnName="ABCDEF1234567890ABCDE4_ABCD1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE4_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -6951,54 +6956,54 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345675" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12341" >
+<table name="ABCDEF1234567890ABCDE5" description="" pkeyName="PK_ABCDEF1234567890AB1" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE4_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE4_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345675" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12341" >
+<table name="ABCDEF1234567890ABCDE5" description="" pkeyName="PK_ABCDEF1234567890AB1" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE4_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 </table>
@@ -7011,9 +7016,9 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345674" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE4" columnName="ABCDEF1234567890ABCDE1_ABCD1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456788" />
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -7033,15 +7038,15 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -7050,21 +7055,21 @@
  fixedCol="False" >
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345674" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12342" >
+<table name="ABCDEF1234567890ABCDE4" description="" pkeyName="PK_ABCDEF1234567890AB2" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
@@ -7087,7 +7092,7 @@
 </targetProperties>
 <class xsi:type="Class" name="bbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345672" tblCreator="False" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -7096,9 +7101,9 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345672" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE2" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Object" name="cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
@@ -7114,7 +7119,7 @@
 </targetProperties>
 <class xsi:type="Class" name="bbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ABCDEF1234567890ABCDEF12345673" tblCreator="False" fixedTbl="False" >
+ tableName="ABCDEF1234567890ABCDE3" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -7123,17 +7128,17 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345673" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE3" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345673" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE3" columnName="ABCDEF1234567890ABCDE2_ABCD1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE2_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -7153,54 +7158,54 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345673" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12343" >
+<table name="ABCDEF1234567890ABCDE3" description="" pkeyName="PK_ABCDEF1234567890AB3" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE2_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE2_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345673" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12343" >
+<table name="ABCDEF1234567890ABCDE3" description="" pkeyName="PK_ABCDEF1234567890AB3" >
 <target>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE2_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </targetColumns>
 </target>
 </table>
@@ -7213,9 +7218,9 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ABCDEF1234567890ABCDEF12345672" columnName="ABCDEF1234567890ABCDEF12345672" colCreator="False" fixedCol="False"  >
+ tableName="ABCDEF1234567890ABCDE2" columnName="ABCDEF1234567890ABCDE1_ABCD1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -7235,15 +7240,15 @@
 </column>
 </property>
 </properties>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
@@ -7252,21 +7257,21 @@
  fixedCol="False" >
 </property>
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789_abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" />
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="ABCDEF1234567890ABCDEF12345672" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDE1_ABCD1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ABCDEF1234567890ABCDEF12345672" description="" pkeyName="PK_ABCDEF1234567890ABCDEF12344" >
+<table name="ABCDEF1234567890ABCDE2" description="" pkeyName="PK_ABCDEF1234567890AB4" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
-<column name="ABCDEF1234567890ABCDEF12345672" />
+<column name="ABCDEF1234567890ABCDE1_ABCD1" />
 </sourceColumns>
 <targetColumns>
-<column name="ABCDEF1234567890ABCDEF12345671" />
+<column name="ABCDEF1234567890ABCDEF123451" />
 </targetColumns>
 </target>
 </table>
@@ -7278,7 +7283,7 @@
 </property>
 <property xsi:type="Geometric" name="Bounds" description="Bounding box for the feature"
 geometricTypes="4" geometryTypes="84224" hasElevation="False" hasMeasure="False"
- tableName="BBCDEF1234567890ABCDEF12345671" columnName="n/a" colCreator="False" fixedCol="False" >
+ tableName="BBCDEF1234567890ABCDE1" columnName="n/a" colCreator="False" fixedCol="False" >
 <Inherited baseClass="Feature" />
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -7298,7 +7303,7 @@
 </column>
 </property>
 </properties>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 <property xsi:type="Data" name="ClassId" />
 <property xsi:type="Data" name="FeatId" />
 <property xsi:type="Data" name="RevisionNumber" />
@@ -7313,11 +7318,11 @@
  objectType="Value" className="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789:obcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" idColumn="" order="ascending"
  fixedCol="False" >
 </property>
-<column name="ABCDEF1234567890ABCDEF12345671" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
+<column name="ABCDEF1234567890ABCDEF123451" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
 <column name="N_A" description="" dataType="VARCHAR2" length="50" scale="0" nullable="False" >
 </column>
-<column name="GBCDEF1234567890ABCDEF12345671" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
+<column name="GBCDEF1234567890ABCDEF123451" description="" dataType="MDSYS.SDO_GEOMETRY" length="0" scale="0" nullable="True" >
 </column>
 <column name="CLASSID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -7327,11 +7332,11 @@
 </column>
 </table>
 <tables>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 <target>
-<table name="BBCDEF1234567890ABCDEF12345671" description="" pkeyName="PK_BBCDEF1234567890ABCDEF12341" >
+<table name="BBCDEF1234567890ABCDE1" description="" pkeyName="PK_BBCDEF1234567890AB1" >
 </table>
 <sourceColumns>
 <column name="CLASSID" />
@@ -7345,7 +7350,7 @@
 </class>
 <class xsi:type="Class" name="oacdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  baseClass="" abstract="False"
- tableName="OACDEF1234567890ABCDEF12345671" tblCreator="False" fixedTbl="False" >
+ tableName="OACDEF1234567890ABCDE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -7353,7 +7358,7 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="OACDEF1234567890ABCDEF12345671" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="OACDEF1234567890ABCDE1" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -7375,7 +7380,7 @@
 </class>
 <class xsi:type="Class" name="obcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  baseClass="" abstract="False"
- tableName="OBCDEF1234567890ABCDEF12345671" tblCreator="False" fixedTbl="False" >
+ tableName="OBCDEF1234567890ABCDE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -7383,7 +7388,7 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="OBCDEF1234567890ABCDEF12345671" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="OBCDEF1234567890ABCDE1" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  objectType="Value" className="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789:oacdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" idColumn="" order="ascending"
@@ -7395,7 +7400,7 @@
 </targetProperties>
 <class xsi:type="Class" name="obcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789.cbcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="OBCDEF1234567890ABCDEF12345672" tblCreator="False" fixedTbl="False" >
+ tableName="OBCDEF1234567890ABCDE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -7403,7 +7408,7 @@
 <property xsi:type="Data" name="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789" description="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef123456789"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="OBCDEF1234567890ABCDEF12345672" columnName="ABCDEF1234567890ABCDEF12345671" colCreator="False" fixedCol="False"  >
+ tableName="OBCDEF1234567890ABCDE2" columnName="ABCDEF1234567890ABCDEF123451" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test4_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test4_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test4_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -86,7 +86,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -96,7 +96,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -117,7 +117,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -128,29 +128,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -170,9 +170,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -185,8 +185,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -201,15 +201,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -222,8 +222,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -254,7 +254,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -265,29 +265,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -307,9 +307,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -322,8 +322,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -338,15 +338,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -359,8 +359,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -377,7 +377,7 @@
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDB3DPOLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -398,7 +398,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -425,7 +425,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -966,7 +966,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -976,7 +976,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -997,7 +997,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1008,29 +1008,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1050,9 +1050,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1075,8 +1075,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1091,15 +1091,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1122,8 +1122,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1154,7 +1154,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1165,29 +1165,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1207,9 +1207,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1232,8 +1232,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1248,15 +1248,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1279,8 +1279,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1297,7 +1297,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1318,7 +1318,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1355,7 +1355,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1398,7 +1398,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1408,21 +1408,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1443,7 +1443,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1475,7 +1475,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1760,7 +1760,7 @@
 </class>
 <class xsi:type="Class" name="AcDbVertexCoordinateValue" description=""
  baseClass="" abstract="False"
- tableName="ACDBVERTEXCOORDINATEVALUE" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXCOORDINATEV1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -1768,12 +1768,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1818,7 +1818,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1827,12 +1827,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1867,7 +1867,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1876,12 +1876,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -2203,7 +2203,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2213,7 +2213,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -2234,7 +2234,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2245,29 +2245,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2287,9 +2287,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2302,8 +2302,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2318,15 +2318,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2339,8 +2339,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2371,7 +2371,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2382,29 +2382,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2424,9 +2424,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2439,8 +2439,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2455,15 +2455,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2476,8 +2476,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2494,7 +2494,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -2515,7 +2515,7 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2542,7 +2542,7 @@
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2915,7 +2915,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -2925,7 +2925,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2933,7 +2933,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -2941,7 +2941,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -2963,9 +2963,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -2995,9 +2995,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3048,7 +3048,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3080,7 +3080,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3350,7 +3350,7 @@
 </column>
 </property>
 </properties>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 <property xsi:type="Data" name="Credit Rating" />
 <property xsi:type="Data" name="First Name" />
 <property xsi:type="Data" name="Last Name" />
@@ -3362,7 +3362,7 @@
 </column>
 </table>
 <tables>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 </table>
@@ -3487,7 +3487,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3497,21 +3497,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3532,9 +3532,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3564,9 +3564,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3616,7 +3616,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3648,7 +3648,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3747,7 +3747,7 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
  objectType="Ordered Collection" className="Electric'l:Maint History Item" idColumn="IT_M__" order="descending"
@@ -3762,7 +3762,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Maint History.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" tblCreator="False" fixedTbl="False" >
+ tableName="MAINT_HISTORY_MAINT_H1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="It'm #" />
@@ -3771,22 +3771,22 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="PART__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -4048,7 +4048,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -4058,7 +4058,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -4066,7 +4066,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -4074,7 +4074,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -4096,9 +4096,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4128,9 +4128,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4181,7 +4181,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -4213,7 +4213,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5445,6 +5445,11 @@
 </column>
 </property>
 </properties>
+<uniqueConstraints>
+<uniqueConstraint>
+<property xsi:type="Data" name="PolyNum" />
+</uniqueConstraint>
+</uniqueConstraints>
 <table name="ZONING" description="" pkeyName="PK_ZONING" >
 <property xsi:type="Data" name="Authority" />
 <property xsi:type="Data" name="ByLaw" />

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test5_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test5_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test5_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -86,7 +86,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -96,7 +96,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -117,7 +117,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -128,29 +128,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE3" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -170,9 +170,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -185,8 +185,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -201,15 +201,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD1" >
+<table name="ACDB3DPOLYLINE_ACDBVE3" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD1" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -222,8 +222,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -254,7 +254,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDb3dPolyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" />
@@ -265,29 +265,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA1" columnName="ACDB3DPOLYLINE_ACDBVERTEXDATA2" colCreator="True" fixedCol="False"  >
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDB3DPOLYLINE_ACDBVE2" columnName="ACDB3DPOLYLINE_ACDBVE1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -307,9 +307,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -322,8 +322,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -338,15 +338,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD2" >
+<table name="ACDB3DPOLYLINE_ACDBVE2" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD2" >
 <target>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -359,8 +359,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA1" />
-<column name="ACDB3DPOLYLINE_ACDBVERTEXDATA2" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_ACDB1" />
+<column name="ACDB3DPOLYLINE_ACDBVE1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDB3DPOLYLINE_FEATID" />
@@ -377,7 +377,7 @@
 <property xsi:type="Data" name="AcDb3dPolyline_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDB3DPOLYLINE_ACDBVERTEXDATA" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDB3DPOLYLINE_ACDBVE1" columnName="ACDB3DPOLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDB3DPOLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -398,7 +398,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -425,7 +425,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDB3DPOLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_ACDB3DPOLYLINE_ACDBVERTEXD3" >
+<table name="ACDB3DPOLYLINE_ACDBVE1" description="" pkeyName="PK_ACDB3DPOLYLINE_ACD3" >
 <target>
 <table name="ACDB3DPOLYLINE" description="" pkeyName="PK_ACDB3DPOLYLINE" >
 </table>
@@ -966,7 +966,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -976,7 +976,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -997,7 +997,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1008,29 +1008,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX3" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC3" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1050,9 +1050,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1075,8 +1075,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1091,15 +1091,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX3" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER1" >
+<table name="ACDBHATCH_POLYLINE_AC3" description="" pkeyName="PK_ACDBHATCH_POLYLINE2" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1122,8 +1122,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1154,7 +1154,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1165,29 +1165,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX1" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_ACDB1" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX2" columnName="ACDBHATCH_POLYLINE_ACDBVERTEX2" colCreator="True" fixedCol="False"  >
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="ACDBHATCH_POLYLINE_AC2" columnName="ACDBHATCH_POLYLINE_AC1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -1207,9 +1207,9 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1232,8 +1232,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1248,15 +1248,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX2" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER2" >
+<table name="ACDBHATCH_POLYLINE_AC2" description="" pkeyName="PK_ACDBHATCH_POLYLINE3" >
 <target>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1279,8 +1279,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX1" />
-<column name="ACDBHATCH_POLYLINE_ACDBVERTEX2" />
+<column name="ACDBHATCH_POLYLINE_AC1_ACDB1" />
+<column name="ACDBHATCH_POLYLINE_AC1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="ACDBHATCH_POLYLINE_FEATID" />
@@ -1297,7 +1297,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACDBVERTEX1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC1" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1318,7 +1318,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1355,7 +1355,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACDBVERTEX1" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACDBVER3" >
+<table name="ACDBHATCH_POLYLINE_AC1" description="" pkeyName="PK_ACDBHATCH_POLYLINE4" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1398,7 +1398,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbHatch.edges.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBHATCH_POLYLINE_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ACDBHATCH_POLYLINE_AC4" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -1408,21 +1408,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBHATCH_POLYLINE_ACXDATA" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ACDBHATCH_POLYLINE_AC4" columnName="ACDBHATCH_POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ACDBHATCH_POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -1443,7 +1443,7 @@
 </column>
 </property>
 </properties>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1475,7 +1475,7 @@
 </column>
 </table>
 <tables>
-<table name="ACDBHATCH_POLYLINE_ACXDATA" description="" pkeyName="PK_ACDBHATCH_POLYLINE_ACXDATA" >
+<table name="ACDBHATCH_POLYLINE_AC4" description="" pkeyName="PK_ACDBHATCH_POLYLINE1" >
 <target>
 <table name="ACDBHATCH_POLYLINE" description="" pkeyName="PK_ACDBHATCH_POLYLINE" >
 <target>
@@ -1760,7 +1760,7 @@
 </class>
 <class xsi:type="Class" name="AcDbVertexCoordinateValue" description=""
  baseClass="" abstract="False"
- tableName="ACDBVERTEXCOORDINATEVALUE" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXCOORDINATEV1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 </identityProperties>
@@ -1768,12 +1768,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXCOORDINATEVALUE" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXCOORDINATEV1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1818,7 +1818,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1827,12 +1827,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR2" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE2" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -1867,7 +1867,7 @@
 </targetProperties>
 <class xsi:type="Class" name="AcDbVertexData.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" tblCreator="False" fixedTbl="False" >
+ tableName="ACDBVERTEXDATA_ACDBVE1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Seq" />
@@ -1876,12 +1876,12 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ACDBVERTEXDATA_ACDBVERTEXCOOR1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
+ tableName="ACDBVERTEXDATA_ACDBVE1" columnName="VALUE1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -2203,7 +2203,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2213,7 +2213,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
@@ -2234,7 +2234,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.normal" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2245,29 +2245,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV2" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA3" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2287,9 +2287,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2302,8 +2302,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2318,15 +2318,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV2" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC1" >
+<table name="POLYLINE_ACDBVERTEXDA3" description="" pkeyName="PK_POLYLINE_ACDBVERTE1" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2339,8 +2339,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2371,7 +2371,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Polyline.vertices.point" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" tblCreator="True" fixedTbl="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Polyline_FeatId" />
@@ -2382,29 +2382,29 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Value" description=""
  dataType="double" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="VALUE1" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="VALUE1" colCreator="True" fixedCol="False"  >
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_POLYL1" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_POLY1" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="AcDbVertexData_Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA_ACDBV1" columnName="POLYLINE_ACDBVERTEXDATA_SEQ" colCreator="True" fixedCol="False"  >
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+ tableName="POLYLINE_ACDBVERTEXDA2" columnName="POLYLINE_ACDBVERTEXDA1_SEQ" colCreator="True" fixedCol="False"  >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -2424,9 +2424,9 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2439,8 +2439,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2455,15 +2455,15 @@
 </column>
 <column name="VALUE1" description="" dataType="NUMBER" length="0" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA_ACDBV1" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA_AC2" >
+<table name="POLYLINE_ACDBVERTEXDA2" description="" pkeyName="PK_POLYLINE_ACDBVERTE2" >
 <target>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2476,8 +2476,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="POLYLINE_ACDBVERTEXDATA_POLYL1" />
-<column name="POLYLINE_ACDBVERTEXDATA_SEQ" />
+<column name="POLYLINE_ACDBVERTEXDA1_POLY1" />
+<column name="POLYLINE_ACDBVERTEXDA1_SEQ" />
 </sourceColumns>
 <targetColumns>
 <column name="POLYLINE_FEATID" />
@@ -2494,7 +2494,7 @@
 <property xsi:type="Data" name="Polyline_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="POLYLINE_ACDBVERTEXDATA" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="POLYLINE_ACDBVERTEXDA1" columnName="POLYLINE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="POLYLINE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -2515,7 +2515,7 @@
 </column>
 </property>
 </properties>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2542,7 +2542,7 @@
 </column>
 </table>
 <tables>
-<table name="POLYLINE_ACDBVERTEXDATA" description="" pkeyName="PK_POLYLINE_ACDBVERTEXDATA" >
+<table name="POLYLINE_ACDBVERTEXDA1" description="" pkeyName="PK_POLYLINE_ACDBVERTE3" >
 <target>
 <table name="POLYLINE" description="" pkeyName="PK_POLYLINE" >
 </table>
@@ -2960,7 +2960,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -2970,7 +2970,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -2978,7 +2978,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -2986,7 +2986,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -3008,9 +3008,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3040,9 +3040,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3093,7 +3093,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3125,7 +3125,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3159,7 +3159,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3169,7 +3169,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -3177,9 +3177,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -3200,7 +3200,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Conductor.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -3211,7 +3211,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -3219,7 +3219,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -3227,7 +3227,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -3235,7 +3235,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -3243,17 +3243,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -3273,9 +3273,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3288,8 +3288,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3310,15 +3310,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3331,8 +3331,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -3349,7 +3349,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -3371,7 +3371,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3391,13 +3391,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="CONDUCTOR" description="" pkeyName="PK_CONDUCTOR" >
 </table>
@@ -3671,7 +3671,7 @@
 </column>
 </property>
 </properties>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 <property xsi:type="Data" name="Credit Rating" />
 <property xsi:type="Data" name="First Name" />
 <property xsi:type="Data" name="Last Name" />
@@ -3683,7 +3683,7 @@
 </column>
 </table>
 <tables>
-<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDENTIAL" >
+<table name="CUSTOMER___RESIDENTIAL" description="" pkeyName="PK_CUSTOMER___RESIDEN1" >
 </table>
 <table name="F_CLASSDEFINITION" description="" pkeyName="" >
 </table>
@@ -3808,7 +3808,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -3818,21 +3818,21 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="True" fixedCol="False"  >
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="True" fixedCol="False"  >
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -3853,9 +3853,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3885,9 +3885,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3937,7 +3937,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -3969,7 +3969,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4002,7 +4002,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4012,15 +4012,15 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="True" fixedCol="False"  >
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="True" fixedCol="False"  >
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="True" fixedCol="False"  >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -4040,7 +4040,7 @@
 </targetProperties>
 <class xsi:type="Class" name="ElectricDevice.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="True" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -4051,43 +4051,43 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="True" fixedCol="False"  >
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="True" fixedCol="False"  >
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="True" fixedCol="False"  >
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="True" fixedCol="False"  >
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="True" fixedCol="False"  >
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="True" fixedCol="False"  >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -4107,9 +4107,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4122,8 +4122,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4144,15 +4144,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4165,8 +4165,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -4183,7 +4183,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="True" fixedCol="False"  >
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
@@ -4204,7 +4204,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4224,13 +4224,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="ELECTRICDEVICE" description="" pkeyName="PK_ELECTRICDEVICE" >
 </table>
@@ -4383,7 +4383,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Employee.home' address.street" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="EMPLOYEE_A_ADDRESS_STREET" tblCreator="True" fixedTbl="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" tblCreator="True" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Employee_First Name" />
@@ -4393,29 +4393,29 @@
 <property xsi:type="Data" name="Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="NAME" colCreator="True" fixedCol="False"  >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="NAME" colCreator="True" fixedCol="False"  >
 <column name="NAME" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Type" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="TYPE" colCreator="True" fixedCol="False"  >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="TYPE" colCreator="True" fixedCol="False"  >
 <column name="TYPE" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Employee_First Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" colCreator="True" fixedCol="False"  >
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE1" colCreator="True" fixedCol="False"  >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Employee_Last Name" description=""
  dataType="string" length="30" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="EMPLOYEE_A_ADDRESS_STREET" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" colCreator="True" fixedCol="False"  >
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+ tableName="EMPLOYEE_A_ADDRESS_ST1" columnName="EMPLOYEE_A_ADDRESS_EMPLOYEE2" colCreator="True" fixedCol="False"  >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -4435,7 +4435,7 @@
 </column>
 </property>
 </properties>
-<table name="EMPLOYEE_A_ADDRESS_STREET" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS_STREET" >
+<table name="EMPLOYEE_A_ADDRESS_ST1" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS1" >
 <target>
 <table name="EMPLOYEE_A_ADDRESS" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS" >
 <target>
@@ -4452,8 +4452,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" />
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" />
 </sourceColumns>
 <targetColumns>
 <column name="EMPLOYEE_FIRST_NAME" />
@@ -4468,13 +4468,13 @@
 </column>
 <column name="TYPE" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" description="" dataType="VARCHAR2" length="30" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="EMPLOYEE_A_ADDRESS_STREET" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS_STREET" >
+<table name="EMPLOYEE_A_ADDRESS_ST1" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS1" >
 <target>
 <table name="EMPLOYEE_A_ADDRESS" description="" pkeyName="PK_EMPLOYEE_A_ADDRESS" >
 <target>
@@ -4491,8 +4491,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_F1" />
-<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE_L1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE1" />
+<column name="EMPLOYEE_A_ADDRESS_EMPLOYEE2" />
 </sourceColumns>
 <targetColumns>
 <column name="EMPLOYEE_FIRST_NAME" />
@@ -4636,7 +4636,7 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
  objectType="Ordered Collection" className="Electric'l:Maint History Item" idColumn="IT_M__" order="descending"
@@ -4651,7 +4651,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Maint History.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" tblCreator="False" fixedTbl="False" >
+ tableName="MAINT_HISTORY_MAINT_H1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="It'm #" />
@@ -4660,22 +4660,22 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="PART__" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="MAINT_HISTORY_MAINT_HISTORY_I1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="MAINT_HISTORY_MAINT_H1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
  dataType="string" length="30" precision="0" scale="0"
@@ -5073,7 +5073,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.graphic.xdata" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_ENTITY1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="Entity_FeatId" />
@@ -5083,7 +5083,7 @@
 <property xsi:type="Data" name="Datavalue" description="datavalue"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="DATAVALUE" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="DATAVALUE" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -5091,7 +5091,7 @@
 <property xsi:type="Data" name="Seq" description="seq"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="SEQ" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="SEQ" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="SEQ" description="" dataType="NUMBER" length="10" scale="0" nullable="False" >
 </column>
@@ -5099,7 +5099,7 @@
 <property xsi:type="Data" name="Entity_FeatId" description="id"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_ENTITY_ACXDATA" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_ENTITY1" columnName="ELECTRICDEVICE_ENTITY_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.graphic.xdata" />
 <column name="ELECTRICDEVICE_ENTITY_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -5121,9 +5121,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5153,9 +5153,9 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY_ACXDATA" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" >
+<table name="ELECTRICDEVICE_ENTITY1" description="" pkeyName="PK_ELECTRICDEVICE_ENT1" >
 <target>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5206,7 +5206,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5238,7 +5238,7 @@
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENTITY" >
+<table name="ELECTRICDEVICE_ENTITY" description="" pkeyName="PK_ELECTRICDEVICE_ENT2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5272,7 +5272,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_1" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -5282,7 +5282,7 @@
 <property xsi:type="Data" name="Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="DATE1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
@@ -5290,9 +5290,9 @@
 <property xsi:type="Data" name="Maintenance History Description" description="datavalue"
  dataType="string" length="50" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="MAINTENANCE_HISTORY_DESCRIPTI1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="MAINTENANCE_HISTORY_DESCRIP1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 </property>
 <property xsi:type="Object" name="work items" description="tasks performed on this date"
@@ -5313,7 +5313,7 @@
 </targetProperties>
 <class xsi:type="Class" name="Transformer.maintenance history.work items" description="Autogenerated Object Property Class"
  baseClass="" abstract="False"
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" tblCreator="False" fixedTbl="False" >
+ tableName="ELECTRICDEVICE_MAINT_2" tblCreator="False" fixedTbl="False" >
 <tableMapping>Concrete</tableMapping>
 <identityProperties>
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
@@ -5324,7 +5324,7 @@
 <property xsi:type="Data" name="It'm #" description="sequence identifier"
  dataType="int16" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="IT_M__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="IT_M__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="IT_M__" description="" dataType="NUMBER" length="5" scale="0" nullable="False" >
 </column>
@@ -5332,7 +5332,7 @@
 <property xsi:type="Data" name="Part #" description="Part used in work item"
  dataType="int32" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="PART__" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="PART__" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="PART__" description="" dataType="NUMBER" length="10" scale="0" nullable="True" >
 </column>
@@ -5340,7 +5340,7 @@
 <property xsi:type="Data" name="Work Description" description="Description of work performed"
  dataType="string" length="4000" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="WORK_DESCRIPTION" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="WORK_DESCRIPTION" description="" dataType="VARCHAR2" length="4000" scale="0" nullable="False" >
 </column>
@@ -5348,7 +5348,7 @@
 <property xsi:type="Data" name="classname" description=""
  dataType="string" length="255" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="True" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="CLASSNAME1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
@@ -5356,17 +5356,17 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_1" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_ELEC1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="Maint History_Date" description="Date of work done"
  dataType="datetime" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY_1" columnName="ELECTRICDEVICE_MAINT_HISTORY_2" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_2" columnName="ELECTRICDEVICE_MAINT_1_DATE1" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history.work items" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </property>
 <property xsi:type="Data" name="ClassName" description="FDO base property: object class name"
@@ -5386,9 +5386,9 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5401,8 +5401,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -5423,15 +5423,15 @@
 </column>
 <column name="CLASSNAME1" description="" dataType="VARCHAR2" length="255" scale="0" nullable="True" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" description="" dataType="DATE" length="0" scale="0" nullable="False" >
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY_1" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" >
+<table name="ELECTRICDEVICE_MAINT_2" description="" pkeyName="PK_ELECTRICDEVICE_MAI1" >
 <target>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5444,8 +5444,8 @@
 </target>
 </table>
 <sourceColumns>
-<column name="ELECTRICDEVICE_MAINT_HISTORY_1" />
-<column name="ELECTRICDEVICE_MAINT_HISTORY_2" />
+<column name="ELECTRICDEVICE_MAINT_1_ELEC1" />
+<column name="ELECTRICDEVICE_MAINT_1_DATE1" />
 </sourceColumns>
 <targetColumns>
 <column name="ELECTRICDEVICE_FEATID" />
@@ -5462,7 +5462,7 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" description="Feature id number (uniquely identifies a feature)"
  dataType="int64" length="0" precision="0" scale="0"
  readOnly="False" featId="False" system="False" nullable="False" autogenerated="False" defaultValue=""
- tableName="ELECTRICDEVICE_MAINT_HISTORY" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
+ tableName="ELECTRICDEVICE_MAINT_1" columnName="ELECTRICDEVICE_FEATID" colCreator="False" fixedCol="False"  >
 <Inherited baseClass="ElectricDevice.maintenance history" />
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
@@ -5484,7 +5484,7 @@
 </column>
 </property>
 </properties>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>
@@ -5504,13 +5504,13 @@
 <property xsi:type="Data" name="ElectricDevice_FeatId" />
 <column name="DATE1" description="" dataType="DATE" length="0" scale="0" nullable="False" >
 </column>
-<column name="MAINTENANCE_HISTORY_DESCRIPTI1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
+<column name="MAINTENANCE_HISTORY_DESCRIP1" description="" dataType="VARCHAR2" length="50" scale="0" nullable="True" >
 </column>
 <column name="ELECTRICDEVICE_FEATID" description="" dataType="NUMBER" length="20" scale="0" nullable="False" >
 </column>
 </table>
 <tables>
-<table name="ELECTRICDEVICE_MAINT_HISTORY" description="" pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" >
+<table name="ELECTRICDEVICE_MAINT_1" description="" pkeyName="PK_ELECTRICDEVICE_MAI2" >
 <target>
 <table name="TRANSFORMER" description="" pkeyName="PK_TRANSFORMER" >
 </table>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test_ov3_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test_ov3_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/apply_schema_test_ov3_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -29,7 +29,7 @@
 <Table pkeyName="PK_CUSTOMER___BUSINESS" name="CUSTOMER___BUSINESS"/>
 </complexType>
 <complexType name="Customer-x20---x20-ResidentialType" tableMapping="Concrete">
-<Table pkeyName="PK_CUSTOMER___RESIDENTIAL" name="CUSTOMER___RESIDENTIAL"/>
+<Table pkeyName="PK_CUSTOMER___RESIDEN1" name="CUSTOMER___RESIDENTIAL"/>
 </complexType>
 <complexType name="ElectricDeviceType" tableMapping="Concrete">
 <Table pkeyName="PK_ELECTRICDEVICE" name="ELECTRICDEVICE"/>
@@ -47,7 +47,7 @@
 </element>
 <element name="graphic">
 <PropertyMappingConcrete>
-<Table pkeyName="PK_ELECTRICDEVICE_ENTITY" name="ELECTRICDEVICE_ENTITY"/>
+<Table pkeyName="PK_ELECTRICDEVICE_ENT2" name="ELECTRICDEVICE_ENTITY"/>
 <element name="FeatId">
 <Column name="FEATID"/>
 </element>
@@ -59,7 +59,7 @@
 </element>
 <element name="xdata">
 <PropertyMappingConcrete>
-<Table pkeyName="PK_ELECTRICDEVICE_ENTITY_ACXD1" name="ELECTRICDEVICE_ENTITY_ACXDATA"/>
+<Table pkeyName="PK_ELECTRICDEVICE_ENT1" name="ELECTRICDEVICE_ENTITY1"/>
 <element name="Datavalue">
 <Column name="DATAVALUE"/>
 </element>
@@ -78,16 +78,16 @@
 </element>
 <element name="maintenance-x20-history">
 <PropertyMappingConcrete>
-<Table pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO2" name="ELECTRICDEVICE_MAINT_HISTORY"/>
+<Table pkeyName="PK_ELECTRICDEVICE_MAI2" name="ELECTRICDEVICE_MAINT_1"/>
 <element name="Date">
 <Column name="DATE1"/>
 </element>
 <element name="Maintenance-x20-History-x20-Description">
-<Column name="MAINTENANCE_HISTORY_DESCRIPTI1"/>
+<Column name="MAINTENANCE_HISTORY_DESCRIP1"/>
 </element>
 <element name="work-x20-items">
 <PropertyMappingConcrete>
-<Table pkeyName="PK_ELECTRICDEVICE_MAINT_HISTO1" name="ELECTRICDEVICE_MAINT_HISTORY_1"/>
+<Table pkeyName="PK_ELECTRICDEVICE_MAI1" name="ELECTRICDEVICE_MAINT_2"/>
 <element name="It-x27-m-x20--x23-">
 <Column name="IT_M__"/>
 </element>
@@ -101,10 +101,10 @@
 <Column name="CLASSNAME1"/>
 </element>
 <element name="ElectricDevice_FeatId">
-<Column name="ELECTRICDEVICE_MAINT_HISTORY_1"/>
+<Column name="ELECTRICDEVICE_MAINT_1_ELEC1"/>
 </element>
 <element name="Maint-x20-History_Date">
-<Column name="ELECTRICDEVICE_MAINT_HISTORY_2"/>
+<Column name="ELECTRICDEVICE_MAINT_1_DATE1"/>
 </element>
 </PropertyMappingConcrete>
 </element>
@@ -120,11 +120,11 @@
 <Column name="DATE1"/>
 </element>
 <element name="Maintenance-x20-History-x20-Description">
-<Column name="MAINTENANCE_HISTORY_DESCRIPTI1"/>
+<Column name="MAINTENANCE_HISTORY_DESCRIP1"/>
 </element>
 <element name="work-x20-items">
 <PropertyMappingConcrete>
-<Table name="MAINT_HISTORY_MAINT_HISTORY_I1"/>
+<Table name="MAINT_HISTORY_MAINT_H1"/>
 <element name="It-x27-m-x20--x23-">
 <Column name="IT_M__"/>
 </element>

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer2005_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -677,10 +677,18 @@
 </xs:extension>
 </xs:complexContent>
 </xs:complexType>
+<xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
+<xs:key name="view1Key">
+<xs:selector xpath=".//view1"/>
+<xs:field xpath="ID"/>
+</xs:key>
+</xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
 <xs:documentation/>
 </xs:annotation>
+<xs:complexContent>
+<xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
@@ -710,11 +718,21 @@
 </xs:annotation>
 </xs:element>
 </xs:sequence>
+</xs:extension>
+</xs:complexContent>
 </xs:complexType>
+<xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
+<xs:key name="view3Key">
+<xs:selector xpath=".//view3"/>
+<xs:field xpath="ID"/>
+</xs:key>
+</xs:element>
 <xs:complexType name="view3Type" abstract="false">
 <xs:annotation>
 <xs:documentation/>
 </xs:annotation>
+<xs:complexContent>
+<xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
@@ -751,6 +769,8 @@
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
+</xs:extension>
+</xs:complexContent>
 </xs:complexType>
 </xs:schema>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/guest" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:guest="http://fdo.osgeo.org/schemas/feature/guest" elementFormDefault="qualified" attributeFormDefault="unqualified">
@@ -1832,6 +1852,12 @@
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
 <Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
 </complexType>
+<complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+</complexType>
+<complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+</complexType>
 </SchemaMapping>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.2" name="guest">
 <complexType name="vertable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/gen_default1_SqlServer_master.txt	2007-02-15 21:34:40 UTC (rev 2547)
@@ -677,10 +677,18 @@
 </xs:extension>
 </xs:complexContent>
 </xs:complexType>
+<xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
+<xs:key name="view1Key">
+<xs:selector xpath=".//view1"/>
+<xs:field xpath="ID"/>
+</xs:key>
+</xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
 <xs:documentation/>
 </xs:annotation>
+<xs:complexContent>
+<xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
@@ -710,11 +718,21 @@
 </xs:annotation>
 </xs:element>
 </xs:sequence>
+</xs:extension>
+</xs:complexContent>
 </xs:complexType>
+<xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
+<xs:key name="view3Key">
+<xs:selector xpath=".//view3"/>
+<xs:field xpath="ID"/>
+</xs:key>
+</xs:element>
 <xs:complexType name="view3Type" abstract="false">
 <xs:annotation>
 <xs:documentation/>
 </xs:annotation>
+<xs:complexContent>
+<xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
@@ -751,6 +769,8 @@
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
+</xs:extension>
+</xs:complexContent>
 </xs:complexType>
 </xs:schema>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.2" name="dbo">
@@ -775,5 +795,11 @@
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
 <Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
 </complexType>
+<complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+</complexType>
+<complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
+<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+</complexType>
 </SchemaMapping>
 </fdo:DataStore>

Modified: trunk/Utilities/SchemaMgr/Src/Sm/Lp/ClassDefinition.cpp
===================================================================
--- trunk/Utilities/SchemaMgr/Src/Sm/Lp/ClassDefinition.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Utilities/SchemaMgr/Src/Sm/Lp/ClassDefinition.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -1853,7 +1853,7 @@
                 // other classes derived from it. 
                 if ( (Get_TableMapping() == FdoSmOvTableMappingType_BaseTable) && (pLpDataProp->GetBaseProperty()) )
                     AddUkeyBasePropError( pFdoDataProp );
-                pLpUniqueC->GetProperties()->Add( pLpDataProp );
+                FdoSmLpDataPropertiesP(pLpUniqueC->GetProperties())->Add( pLpDataProp );
             }
             else {
                 AddUkeyPropMissingError( pFdoDataProp );

Modified: trunk/Utilities/SchemaMgr/Src/Sm/Ph/Table.cpp
===================================================================
--- trunk/Utilities/SchemaMgr/Src/Sm/Ph/Table.cpp	2007-02-15 21:12:35 UTC (rev 2546)
+++ trunk/Utilities/SchemaMgr/Src/Sm/Ph/Table.cpp	2007-02-15 21:34:40 UTC (rev 2547)
@@ -588,7 +588,9 @@
     FdoStringsP     colClauses = FdoStringCollection::Create();
 
     for ( i = 0; i < columns->GetCount(); i++ ) {
-        colClauses->Add( FdoSmPhColumnP(columns->GetItem(i))->GetAddSql() );
+        FdoStringP colSql = FdoSmPhColumnP(columns->GetItem(i))->GetAddSql();
+        if ( colSql != L"" ) 
+            colClauses->Add( colSql );
     }
 
     return colClauses;



More information about the fdo-commits mailing list