TEIID-4291: added logic and test to handle the schema within a schema…

… after teiid designer materialization generates it. TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
teiid · Aug 19, 2016 · d130b89 · d130b89
1 parent 9307bcc
commit d130b89
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 0 deletions.
diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -252,6 +252,9 @@ <h4 class="western">from ${project.version}</h4>
 <a href='https://issues.jboss.org/browse/TEIID-4289'>TEIID-4289</a>] - Add transaction command support for syntax BEGIN/ROLLBACK/COMMIT WORK (adding support for the work/transaction keywords) 
 	<li/>
 	<p style="margin-bottom: 0in">
+<a href='https://issues.jboss.org/browse/TEIID-4299'>TEIID-4299</a>] - Object translator null values correctly (added logic and test to handle the schema within a schema after teiid designer materialization generates it. Regarding trying to set a null on a java native type, added to throw an exception)
+	<li/>
+	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-4304'>TEIID-4304</a>] - Correct handling with subquery in on clause 
 	<li/>
 	<p style="margin-bottom: 0in">

diff --git a/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectPlugin.java b/connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectPlugin.java
@@ -56,6 +56,7 @@ public static enum Event implements BundleUtil.Event{
 		TEIID21014,
 		TEIID21015,
 		TEIID21016,
+		TEIID21301,
 		TEIID21302,
     }
 }
diff --git a/connectors/translator-object/src/test/resources/ObjectProject/Trade.vdb b/connectors/translator-object/src/test/resources/ObjectProject/Trade.vdb
diff --git a/connectors/translator-object/src/test/resources/ObjectProject/Trade_Mat.xmi b/connectors/translator-object/src/test/resources/ObjectProject/Trade_Mat.xmi
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="ASCII"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.metamatrix.com/metamodels/Diagram" xmlns:mmcore="http://www.metamatrix.com/metamodels/Core" xmlns:relational="http://www.metamatrix.com/metamodels/Relational">
+<<<<<<< HEAD
   <mmcore:ModelAnnotation xmi:uuid="mmuuid:5f4d3ef6-026c-4a33-adea-fbf0eda391e7" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational" modelType="PHYSICAL" ProducerName="Teiid Designer" ProducerVersion="10.0.1.Nightly-v20160627-1409-B12">
+=======
+  <mmcore:ModelAnnotation xmi:uuid="mmuuid:5f4d3ef6-026c-4a33-adea-fbf0eda391e7" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational" modelType="PHYSICAL" ProducerName="Teiid Designer" ProducerVersion="10.0.1.Nightly-v20160622-1945-B8">
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
     <modelImports xmi:uuid="mmuuid:7f5cf45f-2fe8-41b6-805b-39f26c5f43ad" name="SimpleDatatypes-instance" modelLocation="http://www.metamatrix.com/metamodels/SimpleDatatypes-instance" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
     <modelImports xmi:uuid="mmuuid:ae44979e-0fda-4ea5-b499-53d6ff652f11" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
   </mmcore:ModelAnnotation>
   <mmcore:AnnotationContainer xmi:uuid="mmuuid:db84df50-0cde-4f7c-b70b-ba9f244886de">
     <annotations xmi:uuid="mmuuid:3c743f95-fad6-4450-9496-d472ccd63b37" annotatedObject="mmuuid/5f4d3ef6-026c-4a33-adea-fbf0eda391e7">
       <tags xmi:uuid="mmuuid:bd4967a5-064d-4ff5-af57-7a07fc1fb6c9" key="modelExtensionDefinition:relational" value="relational"/>
+<<<<<<< HEAD
       <tags xmi:uuid="mmuuid:d38fe6fc-5009-4027-a75f-e2334ce9ea4e" key="modelExtensionDefinition:infinispan" value="infinispan"/>
+=======
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
     </annotations>
     <annotations xmi:uuid="mmuuid:8d7033f4-45f2-4153-9e1e-69844ccc83a0" annotatedObject="mmuuid/bd4967a5-064d-4ff5-af57-7a07fc1fb6c9">
       <tags xmi:uuid="mmuuid:421e0f8b-0301-4b11-a9ad-fa496eb4c4bb" key="metamodel" value="http://www.metamatrix.com/metamodels/Relational"/>
@@ -552,6 +559,7 @@
     <annotations xmi:uuid="mmuuid:04824123-9fb3-404f-88b9-5763c5a328bd" annotatedObject="mmuuid/9971cf31-82f8-4096-9e20-f1da33ad482d">
       <tags xmi:uuid="mmuuid:8dbc7402-3bd8-47e2-9973-561b472d4439" key="en" value="Allows specifying a native type for OUT parameters. Typical value is REF CURSOR"/>
     </annotations>
+<<<<<<< HEAD
     <annotations xmi:uuid="mmuuid:d8440a0c-5726-4f2c-a41e-a341d79e0e6f" annotatedObject="mmuuid/d38fe6fc-5009-4027-a75f-e2334ce9ea4e">
       <tags xmi:uuid="mmuuid:ccfe396b-4a89-48f8-98c2-28cf0e29e2b3" key="metamodel" value="http://www.metamatrix.com/metamodels/Relational"/>
       <tags xmi:uuid="mmuuid:80a3fd3b-7396-4885-bf30-ae0e901b771c" key="namespacePrefix" value="infinispan"/>
@@ -579,6 +587,8 @@
     <annotations xmi:uuid="mmuuid:d6f41b99-4c6b-41d2-80bf-642a2c5b5526" annotatedObject="mmuuid/2b5a463d-d34f-4e9e-a22c-6a9b980319bc">
       <tags xmi:uuid="mmuuid:0f7ed1a8-0afd-427c-b823-2e2136d2070e" key="infinispan:primary_table" value="TradeObject.Trade"/>
     </annotations>
+=======
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
   </mmcore:AnnotationContainer>
   <relational:Schema xmi:uuid="mmuuid:1c059e7c-01d4-4c3c-8c24-def3c7d6cfac" name="Trade_Mat" nameInSource="Trade_Mat">
     <tables xsi:type="relational:BaseTable" xmi:uuid="mmuuid:2b5a463d-d34f-4e9e-a22c-6a9b980319bc" name="Trade" nameInSource="Trades">

diff --git a/connectors/translator-object/src/test/resources/ObjectProject/Trade_View.xmi b/connectors/translator-object/src/test/resources/ObjectProject/Trade_View.xmi
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="ASCII"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:diagram="http://www.metamatrix.com/metamodels/Diagram" xmlns:mmcore="http://www.metamatrix.com/metamodels/Core" xmlns:relational="http://www.metamatrix.com/metamodels/Relational" xmlns:transformation="http://www.metamatrix.com/metamodels/Transformation">
+<<<<<<< HEAD
   <mmcore:ModelAnnotation xmi:uuid="mmuuid:b68bf59f-b3ad-4db6-b1a4-dab83e3b5b56" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational" modelType="VIRTUAL" ProducerName="Teiid Designer" ProducerVersion="10.0.1.Nightly-v20160627-1409-B12">
+=======
+  <mmcore:ModelAnnotation xmi:uuid="mmuuid:b68bf59f-b3ad-4db6-b1a4-dab83e3b5b56" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational" modelType="VIRTUAL" ProducerName="Teiid Designer" ProducerVersion="10.0.1.Nightly-v20160622-1945-B8">
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
     <modelImports xmi:uuid="mmuuid:a2f50f17-b5e5-405a-9c42-98885468ac72" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
     <modelImports xmi:uuid="mmuuid:bc1d14b2-ef98-482d-af90-77e90a7a79c7" name="SimpleDatatypes-instance" modelLocation="http://www.metamatrix.com/metamodels/SimpleDatatypes-instance" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
     <modelImports xmi:uuid="mmuuid:166fed44-bb42-40c4-8169-1bae9b6e5771" name="Trade_Object" modelLocation="Trade_Object.xmi" uuid="mmuuid:abbd65a2-2896-4819-9428-fa8ba13a1b71" modelType="PHYSICAL" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational"/>
     <modelImports xmi:uuid="mmuuid:83922c48-3cdb-4a68-90ae-1e2dc51101ba" name="Trade_Mat" modelLocation="Trade_Mat.xmi" uuid="mmuuid:5f4d3ef6-026c-4a33-adea-fbf0eda391e7" modelType="PHYSICAL" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational"/>
   </mmcore:ModelAnnotation>
   <relational:BaseTable xmi:uuid="mmuuid:1fc3bc7a-7ba3-4940-8422-53735c249676" name="Trade" nameInSource="Trades" supportsUpdate="false" materialized="true">
+<<<<<<< HEAD
     <columns xmi:uuid="mmuuid:511f2da4-40e5-4829-b9f5-38cbf8fc3ee5" name="TradeID" nameInSource="tradeId" nativeType="long" updateable="false" uniqueKeys="mmuuid/bb27e4d7-da59-4bd8-9cdf-b9ef2462d16d">
       <type href="http://www.w3.org/2001/XMLSchema#long"/>
     </columns>
@@ -62,10 +67,76 @@
     <transformationMappings xsi:type="transformation:SqlTransformationMappingRoot" xmi:uuid="mmuuid:6dad4e39-aeec-4af3-a572-fd9d6a9eea8a" outputs="mmuuid/1fc3bc7a-7ba3-4940-8422-53735c249676" target="mmuuid/1fc3bc7a-7ba3-4940-8422-53735c249676">
       <helper xsi:type="transformation:SqlTransformation" xmi:uuid="mmuuid:cc069e3d-2081-4915-bec1-0d288227391f">
         <nested xsi:type="transformation:SqlTransformation" xmi:uuid="mmuuid:3d8e9327-3fc1-4ffb-8a68-dbbe685a0566" selectSql="SELECT Trade_Object.Trade.TradeID, Trade_Object.Trade.TradeName, Trade_Object.Trade.Settled, Trade_Object.Trade.TradeDate FROM Trade_Object.Trade"/>
+=======
+    <columns xmi:uuid="mmuuid:10577b53-845a-498b-8745-61cd275df196" name="TradeObject" nameInSource="this" nativeType="var_binary" length="4000" nullable="NULLABLE_UNKNOWN" defaultValue="" collationName="" updateable="false" caseSensitive="false" searchability="UNSEARCHABLE" radix="0" signed="false" distinctValueCount="0">
+      <type href="http://www.metamatrix.com/metamodels/SimpleDatatypes-instance#object"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:511f2da4-40e5-4829-b9f5-38cbf8fc3ee5" name="TradeID" nameInSource="tradeId" nativeType="long" updateable="false" uniqueKeys="mmuuid/bb27e4d7-da59-4bd8-9cdf-b9ef2462d16d">
+      <type href="http://www.w3.org/2001/XMLSchema#long"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:357d3d38-dd5c-462b-9cb9-e6ec7bfaae37" name="TradeName" nameInSource="name" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#string"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:038a0d13-b0b0-4f5d-bd4d-103f926970ce" name="Settled" nameInSource="settled" nativeType="boolean" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#boolean"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:a5782029-7dd3-4274-9134-27e4235cf277" name="TradeDate" nameInSource="tradeDate" nativeType="java.util.Date" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#date"/>
+    </columns>
+    <materializedTable xsi:type="relational:BaseTable" href="Trade_Mat.xmi#mmuuid/2b5a463d-d34f-4e9e-a22c-6a9b980319bc"/>
+    <primaryKey xmi:uuid="mmuuid:bb27e4d7-da59-4bd8-9cdf-b9ef2462d16d" name="PK_ID" columns="mmuuid/511f2da4-40e5-4829-b9f5-38cbf8fc3ee5" foreignKeys="mmuuid/2ee3ed56-af94-459a-b6a2-907c4b0002f7"/>
+  </relational:BaseTable>
+  <relational:BaseTable xmi:uuid="mmuuid:de4cc42e-2127-400f-a532-20a9262ce39b" name="Leg" nameInSource="Trades" supportsUpdate="false">
+    <columns xmi:uuid="mmuuid:f58a9a62-f32a-4d6d-a2d1-f3ccf0eb35d3" name="TradeID" nameInSource="tradeId" updateable="false" foreignKeys="mmuuid/2ee3ed56-af94-459a-b6a2-907c4b0002f7">
+      <type href="http://www.w3.org/2001/XMLSchema#long"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:f8fbdef0-6d54-4da1-9857-b95bf9b2ab6e" name="Name" nameInSource="legName" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#string"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:0481e480-4d07-4fa0-afd1-64720a664fe2" name="Notational" nameInSource="notational" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#double"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:020c2c3c-d7c8-434d-9c5b-23e3e0969766" name="CreationDate" nameInSource="createdDateTime" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#date"/>
+    </columns>
+    <foreignKeys xmi:uuid="mmuuid:2ee3ed56-af94-459a-b6a2-907c4b0002f7" name="FK_TradeId" nameInSource="legs" columns="mmuuid/f58a9a62-f32a-4d6d-a2d1-f3ccf0eb35d3" uniqueKey="mmuuid/bb27e4d7-da59-4bd8-9cdf-b9ef2462d16d"/>
+  </relational:BaseTable>
+  <relational:BaseTable xmi:uuid="mmuuid:9aacaea1-84c4-416e-b704-14abcaa5158c" name="Trade_Errors" nameInSource="Trade_Errors" supportsUpdate="false">
+    <columns xmi:uuid="mmuuid:2b03ddab-bb97-40aa-88e5-b57f9219d5fd" name="TradeObject" nameInSource="this" nativeType="var_binary" length="4000" nullable="NULLABLE_UNKNOWN" defaultValue="" collationName="" updateable="false" caseSensitive="false" searchability="UNSEARCHABLE" radix="0" signed="false" distinctValueCount="0">
+      <type href="http://www.metamatrix.com/metamodels/SimpleDatatypes-instance#object"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:2ebb5bc9-9a07-490b-a94b-1635e55a52a1" name="TradeID" nameInSource="tradeId" nativeType="long" updateable="false" uniqueKeys="mmuuid/d620fae9-0bf0-4719-8ce1-ee449d401844">
+      <type href="http://www.w3.org/2001/XMLSchema#long"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:77d31641-0bbc-4101-8d75-afdb485e07ca" name="TradeName" nameInSource="name" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#string"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:9f90fb84-f898-43dc-bcac-2f6ff842e8a9" name="Settled" nameInSource="settled" nativeType="boolean" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#boolean"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:3a0f9120-dd95-4d0a-acfe-d038e599a333" name="TradeDate" nameInSource="tradeDate" nativeType="java.util.Date" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#date"/>
+    </columns>
+    <columns xmi:uuid="mmuuid:26ec141d-0833-4913-bed1-cd64106d2b18" name="CustomerId" nameInSource="customerId" updateable="false">
+      <type href="http://www.w3.org/2001/XMLSchema#long"/>
+    </columns>
+    <primaryKey xmi:uuid="mmuuid:d620fae9-0bf0-4719-8ce1-ee449d401844" name="PK_ID" columns="mmuuid/2ebb5bc9-9a07-490b-a94b-1635e55a52a1"/>
+  </relational:BaseTable>
+  <transformation:TransformationContainer xmi:uuid="mmuuid:7c614639-5168-4260-b6f1-6b5e37f840fe">
+    <transformationMappings xsi:type="transformation:SqlTransformationMappingRoot" xmi:uuid="mmuuid:6dad4e39-aeec-4af3-a572-fd9d6a9eea8a" outputs="mmuuid/1fc3bc7a-7ba3-4940-8422-53735c249676" target="mmuuid/1fc3bc7a-7ba3-4940-8422-53735c249676">
+      <helper xsi:type="transformation:SqlTransformation" xmi:uuid="mmuuid:cc069e3d-2081-4915-bec1-0d288227391f">
+        <nested xsi:type="transformation:SqlTransformation" xmi:uuid="mmuuid:3d8e9327-3fc1-4ffb-8a68-dbbe685a0566" selectSql="SELECT * FROM Trade_Object.Trade"/>
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
         <aliases xmi:uuid="mmuuid:0c7f7863-d2c6-4062-b7f3-ad40143a070e" alias="Trade">
           <aliasedObject href="Trade_Object.xmi#mmuuid/e4662c1d-443f-45a8-8623-8a4876ea7539"/>
         </aliases>
       </helper>
+<<<<<<< HEAD
+=======
+      <nested xsi:type="transformation:TransformationMapping" xmi:uuid="mmuuid:1c638f08-fdf9-4b9c-a2da-b6f0772b21e4" outputs="mmuuid/10577b53-845a-498b-8745-61cd275df196">
+        <inputs href="Trade_Object.xmi#mmuuid/73b0ec15-2abe-4f72-b25e-b9113b528b41"/>
+      </nested>
+>>>>>>> f47c421... TEIID-4291 added logic and test to handle the schema within a schema after teiid designer materialization generates it.  TEIID-4299 regarding trying to set a null on a java native type, added to throw an exception
       <nested xsi:type="transformation:TransformationMapping" xmi:uuid="mmuuid:94aae62d-e897-42c8-a5d5-b80b5cd3ef90" outputs="mmuuid/511f2da4-40e5-4829-b9f5-38cbf8fc3ee5">
         <inputs href="Trade_Object.xmi#mmuuid/7ad19ea9-1751-49e0-89c7-e759dd50ff46"/>
       </nested>