[fdo-commits] r706 - trunk/Providers/GenericRdbms/Src/UnitTest

[svn_fdo at osgeo.org]

Author: gavincramer
Date: 2007-01-29 15:02:10 -0500 (Mon, 29 Jan 2007)
New Revision: 706

Modified:
   trunk/Providers/GenericRdbms/Src/UnitTest/OracleTestConfig2.xml
Log:
Port FDO335 from 3.2.x to trunk

Modified: trunk/Providers/GenericRdbms/Src/UnitTest/OracleTestConfig2.xml
===================================================================
--- trunk/Providers/GenericRdbms/Src/UnitTest/OracleTestConfig2.xml	2007-01-29 20:01:37 UTC (rev 705)
+++ trunk/Providers/GenericRdbms/Src/UnitTest/OracleTestConfig2.xml	2007-01-29 20:02:10 UTC (rev 706)
@@ -48,7 +48,7 @@
 	 elementFormDefault="qualified" 
 	 attributeFormDefault="qualified"
 	>
-		<!-- Only one class (Polyline). The following element specifies the identityProperties -->
+		<!-- Define Class Polyline. The following element specifies the identityProperties -->
 		<xs:element name="Polyline" type="Acdb:PolylineType" abstract="false"
 		 substitutionGroup="gml:_Feature"
 		>
@@ -65,11 +65,33 @@
 					<xs:sequence>
 						<xs:element name="Id" type="fdo:int64" />
 						<xs:element name="PolylineDate" type="xs:dateTime" />
-						<xs:element name="Geometry" type="gml:AbstractGeometryType" fdo:hasElevation="false" fdo:geometricTypes="Point" associatedSCName="AcdbSc" />
+						<xs:element name="Geometry" type="gml:AbstractGeometryType" fdo:hasElevation="false" fdo:geometricTypes="Point" fdo:srsName="AcdbSc" />
 		        	</xs:sequence>
       			</xs:extension>
    			</xs:complexContent>
 		</xs:complexType>
+
+		<!-- Define Class Table1 -->
+		<xs:element name="Table1" type="Acdb:Table1Type" abstract="false"
+		 substitutionGroup="gml:_Feature"
+		>
+			<xs:key name="Table1Key"> 
+  				<xs:selector xpath=".//Table1"/>
+				<xs:field xpath="Id"/>
+			</xs:key>
+ 		</xs:element>
+		<xs:complexType name="Table1Type" abstract="false" >
+			<xs:complexContent>
+				<!-- following extension defines Table1 as a Feature Class -->
+				<xs:extension base="gml:AbstractFeatureType">
+					<xs:sequence>
+						<xs:element name="Id" type="fdo:int64" />
+						<xs:element name="Name" type="xs:string" />
+						<xs:element name="Geometry" type="gml:AbstractGeometryType" fdo:hasElevation="false" fdo:geometricTypes="Point" fdo:srsName="AcdbSc" />
+		        	</xs:sequence>
+      			</xs:extension>
+   			</xs:complexContent>
+		</xs:complexType>
 	</xs:schema>
 
 	<!-- Schema Overrides for Acdb Feature Schema -->
@@ -91,5 +113,18 @@
                   <!-- Geometry ordinate columns are overridden -->
 			<element name="Geometry" xColumnName="DOUBLE" yColumnName="SINGLE" />
 		</complexType>
+
+		<!-- Schema Overrides for Table1 Feature Class -->
+		<complexType name="Table1Type">
+			<Table name="TABLE1"/>
+			<element name="Id">
+				<Column name="FEATID1"/>
+			</element>
+			<element name="Name">
+				<Column name="NAME"/>
+			</element>
+                  <!-- Geometry ordinate columns are overridden -->
+			<element name="Geometry" xColumnName="X" yColumnName="Y" />
+		</complexType>
 	</SchemaMapping>
 </fdo:DataStore>