Skip to content

Commit

Permalink
Merge branch 'release/demo2-110117'
Browse files Browse the repository at this point in the history
  • Loading branch information
Denny Mueller committed Jan 10, 2017
2 parents 700e6ad + 9a829a1 commit 0d8f3e8
Show file tree
Hide file tree
Showing 7 changed files with 3,216 additions and 30 deletions.
Binary file added schemas/DataChallenge.vdb
View file
Binary file not shown.
44 changes: 37 additions & 7 deletions sources/Local_User_DB.xmi
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,47 @@
<?xml version="1.0" encoding="ASCII"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:diagram="http://www.metamatrix.com/metamodels/Diagram" xmlns:jdbc="http://www.metamatrix.com/metamodels/JDBC" xmlns:mmcore="http://www.metamatrix.com/metamodels/Core" xmlns:relational="http://www.metamatrix.com/metamodels/Relational">
<mmcore:ModelAnnotation xmi:uuid="mmuuid:d86ed222-382b-4912-bd58-691566a9edfc" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational" modelType="PHYSICAL" ProducerName="Teiid Designer" ProducerVersion="10.0.2.Final-v20161108-1636-B72">
<modelImports xmi:uuid="mmuuid:79433370-94a1-4fe1-b4bf-3d06e4943a56" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
<modelImports xmi:uuid="mmuuid:82151381-c26e-438b-a437-4ee9669a616f" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/>
</mmcore:ModelAnnotation>
<relational:BaseTable xmi:uuid="mmuuid:f3581d43-bfb9-4992-b5b0-f4d607297536" name="users" nameInSource="`data_challenge`.`users`">
<columns xmi:uuid="mmuuid:487bfada-e122-4314-b1c1-96a2d4d4697b" name="userId" nameInSource="`userId`" nativeType="INT" length="10" fixedLength="true" nullable="NO_NULLS" uniqueKeys="mmuuid/889e9021-e66c-482a-8e00-47c541459e86">
<type href="http://www.w3.org/2001/XMLSchema#int"/>
<columns xmi:uuid="mmuuid:487bfada-e122-4314-b1c1-96a2d4d4697b" name="userId" nameInSource="`userId`" nativeType="VARCHAR" length="45" nullable="NO_NULLS" autoIncremented="true" uniqueKeys="mmuuid/889e9021-e66c-482a-8e00-47c541459e86">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:59f1e75a-80d5-4157-88e8-9f10361eb51e" name="share" nameInSource="`share`" nativeType="TINYINT" length="3" fixedLength="true" nullable="NO_NULLS" defaultValue="0">
<type href="http://www.w3.org/2001/XMLSchema#byte"/>
</columns>
<columns xmi:uuid="mmuuid:7287208a-7750-408b-b03b-f0ff745cc1a1" name="xingId" nameInSource="`xingId`" nativeType="VARCHAR" length="45">
<columns xmi:uuid="mmuuid:be187751-920b-48a8-95f8-5a85c5d64125" name="username" nameInSource="`username`" nativeType="VARCHAR" length="45" indexes="mmuuid/dc6505ba-4d68-4950-824f-664fe32b0391">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:ff6f1f19-5ee0-4486-a752-42f8a2d494aa" name="password" nameInSource="`password`" nativeType="VARCHAR" length="45">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:7287208a-7750-408b-b03b-f0ff745cc1a1" name="xingId" nameInSource="`xingId`" nativeType="VARCHAR" length="45" indexes="mmuuid/350b5ec6-9fd9-4a41-bcc7-69c494354c5a">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:e6c305b3-3f77-499a-895d-9e9ddaab83fb" name="xingAccessToken" nameInSource="`xingAccessToken`" nativeType="VARCHAR" length="45" indexes="mmuuid/50851802-e53d-4505-b3ab-0647fd0ffb59">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:a76f79e8-ad74-4785-9644-dc70569c7c35" name="xingAccessSecret" nameInSource="`xingAccessSecret`" nativeType="VARCHAR" length="45">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:0180df47-8bd5-4e45-b700-633739a2247f" name="linkedInId" nameInSource="`linkedInId`" nativeType="VARCHAR" length="45" indexes="mmuuid/7f42f7ba-5512-4023-ad56-8e2335fb3611">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:2833cc47-2fa0-47c3-84e1-e7d427438d00" name="linkedInAccessToken" nameInSource="`linkedInAccessToken`" nativeType="VARCHAR" length="45" indexes="mmuuid/fba0d8cb-0fb9-418d-bbe8-dc2baf5643e8">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<columns xmi:uuid="mmuuid:0180df47-8bd5-4e45-b700-633739a2247f" name="linkedInId" nameInSource="`linkedInId`" nativeType="VARCHAR" length="45">
<columns xmi:uuid="mmuuid:cce2c424-b638-43ac-b2ae-213059742fdc" name="linkedInRefreshToken" nameInSource="`linkedInRefreshToken`" nativeType="VARCHAR" length="45" indexes="mmuuid/97a2f4db-a532-48e5-9964-b62cb91bc8df">
<type href="http://www.w3.org/2001/XMLSchema#string"/>
</columns>
<primaryKey xmi:uuid="mmuuid:889e9021-e66c-482a-8e00-47c541459e86" name="PRIMARY" nameInSource="`PRIMARY`" columns="mmuuid/487bfada-e122-4314-b1c1-96a2d4d4697b"/>
</relational:BaseTable>
<relational:Index xmi:uuid="mmuuid:dc6505ba-4d68-4950-824f-664fe32b0391" name="username_UNIQUE" nameInSource="`data_challenge`.`users`.`username_UNIQUE`" unique="true" columns="mmuuid/be187751-920b-48a8-95f8-5a85c5d64125"/>
<relational:Index xmi:uuid="mmuuid:7f42f7ba-5512-4023-ad56-8e2335fb3611" name="linkedInId_UNIQUE" nameInSource="`data_challenge`.`users`.`linkedInId_UNIQUE`" unique="true" columns="mmuuid/0180df47-8bd5-4e45-b700-633739a2247f"/>
<relational:Index xmi:uuid="mmuuid:350b5ec6-9fd9-4a41-bcc7-69c494354c5a" name="xingId_UNIQUE" nameInSource="`data_challenge`.`users`.`xingId_UNIQUE`" unique="true" columns="mmuuid/7287208a-7750-408b-b03b-f0ff745cc1a1"/>
<relational:Index xmi:uuid="mmuuid:fba0d8cb-0fb9-418d-bbe8-dc2baf5643e8" name="linkedInAccessToken_UNIQUE" nameInSource="`data_challenge`.`users`.`linkedInAccessToken_UNIQUE`" unique="true" columns="mmuuid/2833cc47-2fa0-47c3-84e1-e7d427438d00"/>
<relational:Index xmi:uuid="mmuuid:50851802-e53d-4505-b3ab-0647fd0ffb59" name="xingAccessToken_UNIQUE" nameInSource="`data_challenge`.`users`.`xingAccessToken_UNIQUE`" unique="true" columns="mmuuid/e6c305b3-3f77-499a-895d-9e9ddaab83fb"/>
<relational:Index xmi:uuid="mmuuid:97a2f4db-a532-48e5-9964-b62cb91bc8df" name="linkedInRefreshToken_UNIQUE" nameInSource="`data_challenge`.`users`.`linkedInRefreshToken_UNIQUE`" unique="true" columns="mmuuid/cce2c424-b638-43ac-b2ae-213059742fdc"/>
<mmcore:AnnotationContainer xmi:uuid="mmuuid:a906d753-bf2d-42d5-b739-0904ca685a8f">
<annotations xmi:uuid="mmuuid:fd33f90e-ee03-4f18-8607-9b7f0253489a" annotatedObject="mmuuid/d86ed222-382b-4912-bd58-691566a9edfc">
<tags xmi:uuid="mmuuid:131132f2-3eb0-430d-b99f-2b3fe68f81ca" key="connection:driver-class" value="com.mysql.jdbc.Driver"/>
Expand Down Expand Up @@ -581,10 +605,16 @@
<diagram:DiagramContainer xmi:uuid="mmuuid:986f8850-270d-4b59-a976-1f0d7f7982c5">
<diagram xmi:uuid="mmuuid:eb336dc5-b3bc-4cd6-b60f-ea2c32c88894" type="packageDiagramType" target="mmuuid/d86ed222-382b-4912-bd58-691566a9edfc">
<diagramEntity xmi:uuid="mmuuid:6c54abbb-ba1b-458e-a5a6-a1dfd86077c2" modelObject="mmuuid/f3581d43-bfb9-4992-b5b0-f4d607297536" xPosition="10" yPosition="10"/>
<diagramEntity xmi:uuid="mmuuid:d09a9578-78c2-41e9-9531-93fbe7cbe3ab" modelObject="mmuuid/dc6505ba-4d68-4950-824f-664fe32b0391" xPosition="242" yPosition="76"/>
<diagramEntity xmi:uuid="mmuuid:fe9238f6-9644-4608-be9a-d0c68680c7ab" modelObject="mmuuid/7f42f7ba-5512-4023-ad56-8e2335fb3611"/>
<diagramEntity xmi:uuid="mmuuid:571f7de8-1dbe-4e83-98e6-869f068df6d3" modelObject="mmuuid/350b5ec6-9fd9-4a41-bcc7-69c494354c5a"/>
<diagramEntity xmi:uuid="mmuuid:e54913bd-3506-48ae-b7b4-563525fbfa80" modelObject="mmuuid/fba0d8cb-0fb9-418d-bbe8-dc2baf5643e8" xPosition="20" yPosition="20"/>
<diagramEntity xmi:uuid="mmuuid:ba736f82-8fa3-4590-8d8b-6c3a04d6fbf4" modelObject="mmuuid/50851802-e53d-4505-b3ab-0647fd0ffb59" xPosition="40" yPosition="30"/>
<diagramEntity xmi:uuid="mmuuid:2b227668-6abc-4d7f-861b-3b49fd731fe5" modelObject="mmuuid/97a2f4db-a532-48e5-9964-b62cb91bc8df" xPosition="20" yPosition="20"/>
</diagram>
</diagram:DiagramContainer>
<jdbc:JdbcSource xmi:uuid="mmuuid:aa4ba83f-0a08-4704-ac4a-820b924c2ebd" name="Local User DB" driverName="MySQL JDBC Driver" driverClass="com.mysql.jdbc.Driver" username="data_challenge" url="jdbc:mysql://localhost:3306/data_challenge">
<importSettings xmi:uuid="mmuuid:0784cccd-41b2-4319-a1a9-c1b8c134e39a" createSchemasInModel="false" includeIndexes="false" includeApproximateIndexes="false">
<jdbc:JdbcSource xmi:uuid="mmuuid:5110e7cc-ea12-43b0-9fd1-914b78d7537e" name="Local User DB" driverName="MySQL JDBC Driver" driverClass="com.mysql.jdbc.Driver" username="data_challenge" url="jdbc:mysql://localhost:3306/data_challenge">
<importSettings xmi:uuid="mmuuid:31da938e-330f-4787-95d5-4b5e38ee418b" createSchemasInModel="false" includeApproximateIndexes="false">
<includedCatalogPaths>/data_challenge</includedCatalogPaths>
<includedTableTypes>LOCAL TEMPORARY</includedTableTypes>
<includedTableTypes>SYSTEM TABLE</includedTableTypes>
Expand Down
Loading

0 comments on commit 0d8f3e8

Please sign in to comment.