Project

General

Profile

« Previous | Next » 

Revision 8679

schemas/VegCore/VegCore.ERD.mwb: specimen: removed redundant stamping_institution and donor_institution, because these are now in orig_collection.institution. (it is assumed that stamping_institution and donor_institution are the same, because the first institution to acquire and store a specimen (the donor) is the one that stamps it with an accession_number.)

View differences:

schemas/VegCore/document.mwb.xml
5887 5887
                      <link type="object" struct-name="db.SimpleDatatype" key="simpleType">com.mysql.rdbms.mysql.datatype.varbinary</link>
5888 5888
                      <value type="string" key="comment"></value>
5889 5889
                      <value type="string" key="name">orig_collection</value>
5890
                      <value type="string" key="oldName">collection</value>
5890
                      <value type="string" key="oldName">orig_collection</value>
5891 5891
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
5892 5892
                    </value>
5893 5893
                    <value type="object" struct-name="db.mysql.Column" id="bb0eaf44-ad10-11e2-b309-080027bcf912" struct-checksum="0x783b5183">
......
5906 5906
                      <link type="object" struct-name="db.SimpleDatatype" key="simpleType">com.mysql.rdbms.mysql.datatype.varbinary</link>
5907 5907
                      <value type="string" key="comment"></value>
5908 5908
                      <value type="string" key="name">current_collection</value>
5909
                      <value type="string" key="oldName"></value>
5909
                      <value type="string" key="oldName">current_collection</value>
5910 5910
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
5911 5911
                    </value>
5912
                    <value type="object" struct-name="db.mysql.Column" id="c67306ac-a7a0-11e2-b667-080027bcf912" struct-checksum="0x783b5183">
5913
                      <value type="int" key="autoIncrement">0</value>
5914
                      <value type="string" key="characterSetName"></value>
5915
                      <value _ptr_="0xa748450" type="list" content-type="object" content-struct-name="db.CheckConstraint" key="checks"/>
5916
                      <value type="string" key="collationName"></value>
5917
                      <value type="string" key="datatypeExplicitParams"></value>
5918
                      <value type="string" key="defaultValue"></value>
5919
                      <value type="int" key="defaultValueIsNull">1</value>
5920
                      <value _ptr_="0xa7487d0" type="list" content-type="string" key="flags"/>
5921
                      <value type="int" key="isNotNull">0</value>
5922
                      <value type="int" key="length">767</value>
5923
                      <value type="int" key="precision">-1</value>
5924
                      <value type="int" key="scale">-1</value>
5925
                      <link type="object" struct-name="db.SimpleDatatype" key="simpleType">com.mysql.rdbms.mysql.datatype.varbinary</link>
5926
                      <value type="string" key="comment"></value>
5927
                      <value type="string" key="name">stamping_institution</value>
5928
                      <value type="string" key="oldName">stamping_institution</value>
5929
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
5930
                    </value>
5931
                    <value type="object" struct-name="db.mysql.Column" id="c673017a-a7a0-11e2-b667-080027bcf912" struct-checksum="0x783b5183">
5932
                      <value type="int" key="autoIncrement">0</value>
5933
                      <value type="string" key="characterSetName"></value>
5934
                      <value _ptr_="0xa748920" type="list" content-type="object" content-struct-name="db.CheckConstraint" key="checks"/>
5935
                      <value type="string" key="collationName"></value>
5936
                      <value type="string" key="datatypeExplicitParams"></value>
5937
                      <value type="string" key="defaultValue"></value>
5938
                      <value type="int" key="defaultValueIsNull">1</value>
5939
                      <value _ptr_="0xa748ca0" type="list" content-type="string" key="flags"/>
5940
                      <value type="int" key="isNotNull">0</value>
5941
                      <value type="int" key="length">767</value>
5942
                      <value type="int" key="precision">-1</value>
5943
                      <value type="int" key="scale">-1</value>
5944
                      <link type="object" struct-name="db.SimpleDatatype" key="simpleType">com.mysql.rdbms.mysql.datatype.varbinary</link>
5945
                      <value type="string" key="comment"></value>
5946
                      <value type="string" key="name">donor_institution</value>
5947
                      <value type="string" key="oldName">donor_institution</value>
5948
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
5949
                    </value>
5950 5912
                    <value type="object" struct-name="db.mysql.Column" id="c673038c-a7a0-11e2-b667-080027bcf912" struct-checksum="0x783b5183">
5951 5913
                      <value type="int" key="autoIncrement">0</value>
5952 5914
                      <value type="string" key="characterSetName"></value>
......
6052 6014
                      <value type="string" key="name">fk_specimen_collection1</value>
6053 6015
                      <value type="string" key="oldName">fk_specimen_collection1</value>
6054 6016
                    </value>
6055
                    <value type="object" struct-name="db.mysql.ForeignKey" id="e0c90e62-a925-11e2-acee-080027bcf912" struct-checksum="0x70a8fc40">
6056
                      <link type="object" struct-name="db.mysql.Table" key="referencedTable">049df920-a91b-11e2-bdec-080027bcf912</link>
6057
                      <value _ptr_="0xa74a458" type="list" content-type="object" content-struct-name="db.Column" key="columns">
6058
                        <link type="object">c67306ac-a7a0-11e2-b667-080027bcf912</link>
6059
                      </value>
6060
                      <value type="int" key="deferability">0</value>
6061
                      <value type="string" key="deleteRule">CASCADE</value>
6062
                      <link type="object" struct-name="db.Index" key="index">e0c91542-a925-11e2-acee-080027bcf912</link>
6063
                      <value type="int" key="mandatory">1</value>
6064
                      <value type="int" key="many">1</value>
6065
                      <value type="int" key="modelOnly">0</value>
6066
                      <link type="object" struct-name="db.Table" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6067
                      <value _ptr_="0xa74a7e0" type="list" content-type="object" content-struct-name="db.Column" key="referencedColumns">
6068
                        <link type="object">049dfc5e-a91b-11e2-bdec-080027bcf912</link>
6069
                      </value>
6070
                      <value type="int" key="referencedMandatory">1</value>
6071
                      <value type="string" key="updateRule">CASCADE</value>
6072
                      <value type="string" key="comment"></value>
6073
                      <value type="string" key="name">fk_specimen_organization1</value>
6074
                      <value type="string" key="oldName">fk_specimen_organization1</value>
6075
                    </value>
6076
                    <value type="object" struct-name="db.mysql.ForeignKey" id="e7587056-a925-11e2-acee-080027bcf912" struct-checksum="0x70a8fc40">
6077
                      <link type="object" struct-name="db.mysql.Table" key="referencedTable">049df920-a91b-11e2-bdec-080027bcf912</link>
6078
                      <value _ptr_="0xa74a850" type="list" content-type="object" content-struct-name="db.Column" key="columns">
6079
                        <link type="object">c673017a-a7a0-11e2-b667-080027bcf912</link>
6080
                      </value>
6081
                      <value type="int" key="deferability">0</value>
6082
                      <value type="string" key="deleteRule">CASCADE</value>
6083
                      <link type="object" struct-name="db.Index" key="index">e758765a-a925-11e2-acee-080027bcf912</link>
6084
                      <value type="int" key="mandatory">1</value>
6085
                      <value type="int" key="many">1</value>
6086
                      <value type="int" key="modelOnly">0</value>
6087
                      <link type="object" struct-name="db.Table" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6088
                      <value _ptr_="0xa74abd8" type="list" content-type="object" content-struct-name="db.Column" key="referencedColumns">
6089
                        <link type="object">049dfc5e-a91b-11e2-bdec-080027bcf912</link>
6090
                      </value>
6091
                      <value type="int" key="referencedMandatory">1</value>
6092
                      <value type="string" key="updateRule">CASCADE</value>
6093
                      <value type="string" key="comment"></value>
6094
                      <value type="string" key="name">fk_specimen_organization2</value>
6095
                      <value type="string" key="oldName">fk_specimen_organization2</value>
6096
                    </value>
6097 6017
                    <value type="object" struct-name="db.mysql.ForeignKey" id="ec6965f0-a925-11e2-acee-080027bcf912" struct-checksum="0x70a8fc40">
6098 6018
                      <link type="object" struct-name="db.mysql.Table" key="referencedTable">049df920-a91b-11e2-bdec-080027bcf912</link>
6099 6019
                      <value _ptr_="0xa74ac48" type="list" content-type="object" content-struct-name="db.Column" key="columns">
......
6226 6146
                      <value type="string" key="oldName">fk_specimen_collection1_idx</value>
6227 6147
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6228 6148
                    </value>
6229
                    <value type="object" struct-name="db.mysql.Index" id="e0c91542-a925-11e2-acee-080027bcf912" struct-checksum="0x309b847a">
6230
                      <value _ptr_="0xa74bb20" type="list" content-type="object" content-struct-name="db.mysql.IndexColumn" key="columns">
6231
                        <value type="object" struct-name="db.mysql.IndexColumn" id="e0c963f8-a925-11e2-acee-080027bcf912" struct-checksum="0x62630b3c">
6232
                          <value type="int" key="columnLength">0</value>
6233
                          <value type="string" key="comment"></value>
6234
                          <value type="int" key="descend">0</value>
6235
                          <link type="object" struct-name="db.Column" key="referencedColumn">c67306ac-a7a0-11e2-b667-080027bcf912</link>
6236
                          <value type="string" key="name"></value>
6237
                          <link type="object" struct-name="GrtObject" key="owner">e0c91542-a925-11e2-acee-080027bcf912</link>
6238
                        </value>
6239
                      </value>
6240
                      <value type="string" key="indexKind"></value>
6241
                      <value type="int" key="keyBlockSize">0</value>
6242
                      <value type="string" key="withParser"></value>
6243
                      <value type="string" key="comment"></value>
6244
                      <value type="int" key="deferability">0</value>
6245
                      <value type="string" key="indexType">INDEX</value>
6246
                      <value type="int" key="isPrimary">0</value>
6247
                      <value type="string" key="name">fk_specimen_organization1_idx</value>
6248
                      <value type="int" key="unique">0</value>
6249
                      <value type="string" key="oldName">fk_specimen_organization1_idx</value>
6250
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6251
                    </value>
6252
                    <value type="object" struct-name="db.mysql.Index" id="e758765a-a925-11e2-acee-080027bcf912" struct-checksum="0x309b847a">
6253
                      <value _ptr_="0xa74c200" type="list" content-type="object" content-struct-name="db.mysql.IndexColumn" key="columns">
6254
                        <value type="object" struct-name="db.mysql.IndexColumn" id="e758a30a-a925-11e2-acee-080027bcf912" struct-checksum="0x62630b3c">
6255
                          <value type="int" key="columnLength">0</value>
6256
                          <value type="string" key="comment"></value>
6257
                          <value type="int" key="descend">0</value>
6258
                          <link type="object" struct-name="db.Column" key="referencedColumn">c673017a-a7a0-11e2-b667-080027bcf912</link>
6259
                          <value type="string" key="name"></value>
6260
                          <link type="object" struct-name="GrtObject" key="owner">e758765a-a925-11e2-acee-080027bcf912</link>
6261
                        </value>
6262
                      </value>
6263
                      <value type="string" key="indexKind"></value>
6264
                      <value type="int" key="keyBlockSize">0</value>
6265
                      <value type="string" key="withParser"></value>
6266
                      <value type="string" key="comment"></value>
6267
                      <value type="int" key="deferability">0</value>
6268
                      <value type="string" key="indexType">INDEX</value>
6269
                      <value type="int" key="isPrimary">0</value>
6270
                      <value type="string" key="name">fk_specimen_organization2_idx</value>
6271
                      <value type="int" key="unique">0</value>
6272
                      <value type="string" key="oldName">fk_specimen_organization2_idx</value>
6273
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6274
                    </value>
6275 6149
                    <value type="object" struct-name="db.mysql.Index" id="ec696cb2-a925-11e2-acee-080027bcf912" struct-checksum="0x309b847a">
6276 6150
                      <value _ptr_="0xa74c8e0" type="list" content-type="object" content-struct-name="db.mysql.IndexColumn" key="columns">
6277 6151
                        <value type="object" struct-name="db.mysql.IndexColumn" id="ec699c50-a925-11e2-acee-080027bcf912" struct-checksum="0x62630b3c">
......
6361 6235
                      <value type="int" key="isPrimary">0</value>
6362 6236
                      <value type="string" key="name">fk_specimen_collection2_idx</value>
6363 6237
                      <value type="int" key="unique">0</value>
6364
                      <value type="string" key="oldName">fk_specimen_collection2</value>
6238
                      <value type="string" key="oldName">fk_specimen_collection2_idx</value>
6365 6239
                      <link type="object" struct-name="GrtObject" key="owner">c672f914-a7a0-11e2-b667-080027bcf912</link>
6366 6240
                    </value>
6367 6241
                  </value>
......
11330 11204
                <value type="int" key="visible">1</value>
11331 11205
                <value type="string" key="name"></value>
11332 11206
              </value>
11333
              <value type="object" struct-name="workbench.physical.Connection" id="e0c99bc0-a925-11e2-acee-080027bcf912" struct-checksum="0x9baebc92">
11334
                <value type="string" key="caption">fk_specimen_organization1</value>
11335
                <value type="real" key="captionXOffs">0.e+00</value>
11336
                <value type="real" key="captionYOffs">0.e+00</value>
11337
                <value type="string" key="comment"></value>
11338
                <value type="real" key="endCaptionXOffs">0.e+00</value>
11339
                <value type="real" key="endCaptionYOffs">0.e+00</value>
11340
                <value type="string" key="extraCaption"></value>
11341
                <value type="real" key="extraCaptionXOffs">0.e+00</value>
11342
                <value type="real" key="extraCaptionYOffs">0.e+00</value>
11343
                <link type="object" struct-name="db.ForeignKey" key="foreignKey">e0c90e62-a925-11e2-acee-080027bcf912</link>
11344
                <value type="real" key="middleSegmentOffset">0.e+00</value>
11345
                <value type="real" key="startCaptionXOffs">0.e+00</value>
11346
                <value type="real" key="startCaptionYOffs">0.e+00</value>
11347
                <value type="int" key="drawSplit">1</value>
11348
                <link type="object" struct-name="model.Figure" key="endFigure">049e0d16-a91b-11e2-bdec-080027bcf912</link>
11349
                <link type="object" struct-name="model.Figure" key="startFigure">627FF2A4-9311-4DBE-9DB0-1355360AACEA</link>
11350
                <link type="object" struct-name="model.Diagram" key="owner">3915EB3C-D507-4518-BE3A-63A8D8DD4471</link>
11351
                <value type="int" key="visible">1</value>
11352
                <value type="string" key="name"></value>
11353
              </value>
11354
              <value type="object" struct-name="workbench.physical.Connection" id="e758dc26-a925-11e2-acee-080027bcf912" struct-checksum="0x9baebc92">
11355
                <value type="string" key="caption">fk_specimen_organization2</value>
11356
                <value type="real" key="captionXOffs">0.e+00</value>
11357
                <value type="real" key="captionYOffs">0.e+00</value>
11358
                <value type="string" key="comment"></value>
11359
                <value type="real" key="endCaptionXOffs">0.e+00</value>
11360
                <value type="real" key="endCaptionYOffs">0.e+00</value>
11361
                <value type="string" key="extraCaption"></value>
11362
                <value type="real" key="extraCaptionXOffs">0.e+00</value>
11363
                <value type="real" key="extraCaptionYOffs">0.e+00</value>
11364
                <link type="object" struct-name="db.ForeignKey" key="foreignKey">e7587056-a925-11e2-acee-080027bcf912</link>
11365
                <value type="real" key="middleSegmentOffset">0.e+00</value>
11366
                <value type="real" key="startCaptionXOffs">0.e+00</value>
11367
                <value type="real" key="startCaptionYOffs">0.e+00</value>
11368
                <value type="int" key="drawSplit">1</value>
11369
                <link type="object" struct-name="model.Figure" key="endFigure">049e0d16-a91b-11e2-bdec-080027bcf912</link>
11370
                <link type="object" struct-name="model.Figure" key="startFigure">627FF2A4-9311-4DBE-9DB0-1355360AACEA</link>
11371
                <link type="object" struct-name="model.Diagram" key="owner">3915EB3C-D507-4518-BE3A-63A8D8DD4471</link>
11372
                <value type="int" key="visible">1</value>
11373
                <value type="string" key="name"></value>
11374
              </value>
11375 11207
              <value type="object" struct-name="workbench.physical.Connection" id="ec69d940-a925-11e2-acee-080027bcf912" struct-checksum="0x9baebc92">
11376 11208
                <value type="string" key="caption">fk_specimen_organization3</value>
11377 11209
                <value type="real" key="captionXOffs">0.e+00</value>
......
11656 11488
                <value type="real" key="extraCaptionXOffs">0.e+00</value>
11657 11489
                <value type="real" key="extraCaptionYOffs">0.e+00</value>
11658 11490
                <link type="object" struct-name="db.ForeignKey" key="foreignKey">6ec4a89c-ad05-11e2-b309-080027bcf912</link>
11659
                <value type="real" key="middleSegmentOffset">-6.3e+01</value>
11491
                <value type="real" key="middleSegmentOffset">-4.1e+01</value>
11660 11492
                <value type="real" key="startCaptionXOffs">0.e+00</value>
11661 11493
                <value type="real" key="startCaptionYOffs">0.e+00</value>
11662 11494
                <value type="int" key="drawSplit">0</value>
......
12220 12052
                <value type="int" key="expanded">1</value>
12221 12053
                <value type="real" key="height">7.7e+01</value>
12222 12054
                <link type="object" struct-name="model.Layer" key="layer">88F9E582-B992-43CC-B7D6-A42E190DCB13</link>
12223
                <value type="real" key="left">1.411e+03</value>
12055
                <value type="real" key="left">1.391e+03</value>
12224 12056
                <value type="int" key="locked">0</value>
12225 12057
                <value type="int" key="manualSizing">0</value>
12226 12058
                <value type="real" key="top">3.35e+02</value>
......
12260 12092
                <value type="int" key="expanded">1</value>
12261 12093
                <value type="real" key="height">7.7e+01</value>
12262 12094
                <link type="object" struct-name="model.Layer" key="layer">88F9E582-B992-43CC-B7D6-A42E190DCB13</link>
12263
                <value type="real" key="left">1.412e+03</value>
12095
                <value type="real" key="left">1.392e+03</value>
12264 12096
                <value type="int" key="locked">0</value>
12265 12097
                <value type="int" key="manualSizing">0</value>
12266 12098
                <value type="real" key="top">4.91e+02</value>
......
12298 12130
                <value type="int" key="triggersExpanded">0</value>
12299 12131
                <value type="string" key="color">#CCCC33</value>
12300 12132
                <value type="int" key="expanded">1</value>
12301
                <value type="real" key="height">2.84e+02</value>
12133
                <value type="real" key="height">2.38e+02</value>
12302 12134
                <link type="object" struct-name="model.Layer" key="layer">88F9E582-B992-43CC-B7D6-A42E190DCB13</link>
12303
                <value type="real" key="left">1.482e+03</value>
12135
                <value type="real" key="left">1.486e+03</value>
12304 12136
                <value type="int" key="locked">0</value>
12305 12137
                <value type="int" key="manualSizing">0</value>
12306
                <value type="real" key="top">5.8e+02</value>
12307
                <value type="real" key="width">1.19e+02</value>
12138
                <value type="real" key="top">5.73e+02</value>
12139
                <value type="real" key="width">1.14e+02</value>
12308 12140
                <link type="object" struct-name="model.Diagram" key="owner">3915EB3C-D507-4518-BE3A-63A8D8DD4471</link>
12309 12141
                <value type="int" key="visible">1</value>
12310 12142
                <value type="string" key="name">specimen</value>
......
13117 12949
              <value type="int" key="visible">1</value>
13118 12950
              <value type="string" key="name"></value>
13119 12951
            </value>
13120
            <value _ptr_="0xa781968" type="list" content-type="object" content-struct-name="model.Object" key="selection"/>
12952
            <value _ptr_="0xa781968" type="list" content-type="object" content-struct-name="model.Object" key="selection">
12953
              <link type="object">793D3016-8986-43EC-A4BD-1926D93F12C5</link>
12954
            </value>
13121 12955
            <value type="int" key="updateBlocked">0</value>
13122 12956
            <value type="real" key="width">1.6215e+03</value>
13123 12957
            <value type="real" key="x">0.e+00</value>
......
13212 13046
    <value type="object" struct-name="app.DocumentInfo" id="BEE3982F-55A1-4B2C-914A-CD6953803AB9" struct-checksum="0xbba780b8" key="info">
13213 13047
      <value type="string" key="author">Aaron Marcuse-Kubitza</value>
13214 13048
      <value type="string" key="caption">New Model</value>
13215
      <value type="string" key="dateChanged">2013-04-24 11:59</value>
13049
      <value type="string" key="dateChanged">2013-04-24 12:03</value>
13216 13050
      <value type="string" key="dateCreated">2012-01-19 14:06</value>
13217 13051
      <value type="string" key="description"></value>
13218 13052
      <value type="string" key="project">Name of the project</value>
schemas/VegCore/VegCore.my.sql
467 467
  `collection_event` VARBINARY(767) NULL ,
468 468
  `orig_collection` VARBINARY(767) NULL DEFAULT NULL ,
469 469
  `current_collection` VARBINARY(767) NULL ,
470
  `stamping_institution` VARBINARY(767) NULL DEFAULT NULL ,
471
  `donor_institution` VARBINARY(767) NULL DEFAULT NULL ,
472 470
  `owner` VARBINARY(767) NULL DEFAULT NULL ,
473 471
  `barcode` VARBINARY(767) NULL DEFAULT NULL ,
474 472
  `accession_number` VARBINARY(767) NULL DEFAULT NULL ,
475 473
  PRIMARY KEY (`id`) ,
476 474
  INDEX `fk_specimen_collection1_idx` (`orig_collection` ASC) ,
477
  INDEX `fk_specimen_organization1_idx` (`stamping_institution` ASC) ,
478
  INDEX `fk_specimen_organization2_idx` (`donor_institution` ASC) ,
479 475
  INDEX `fk_specimen_organization3_idx` (`owner` ASC) ,
480 476
  INDEX `fk_specimen_taxon_observation1_idx` (`collection_event` ASC) ,
481 477
  INDEX `fk_specimen_individual1_idx` (`individual` ASC) ,
......
490 486
    REFERENCES `collection` (`id` )
491 487
    ON DELETE CASCADE
492 488
    ON UPDATE CASCADE,
493
  CONSTRAINT `fk_specimen_organization1`
494
    FOREIGN KEY (`stamping_institution` )
495
    REFERENCES `organization` (`id` )
496
    ON DELETE CASCADE
497
    ON UPDATE CASCADE,
498
  CONSTRAINT `fk_specimen_organization2`
499
    FOREIGN KEY (`donor_institution` )
500
    REFERENCES `organization` (`id` )
501
    ON DELETE CASCADE
502
    ON UPDATE CASCADE,
503 489
  CONSTRAINT `fk_specimen_organization3`
504 490
    FOREIGN KEY (`owner` )
505 491
    REFERENCES `organization` (`id` )

Also available in: Unified diff