Project

General

Profile

« Previous | Next » 

Revision 10476

bugfix: schemas/VegCore/VegCore.ERD.mwb: geovalidation: made scrubbed_geoplace optional because not all geoplaces will scrub to a valid geoplace

View differences:

schemas/VegCore/document.mwb.xml
9008 9008
                      <value type="string" key="collationName"></value>
9009 9009
                      <value type="string" key="datatypeExplicitParams"></value>
9010 9010
                      <value type="string" key="defaultValue"></value>
9011
                      <value type="int" key="defaultValueIsNull">0</value>
9011
                      <value type="int" key="defaultValueIsNull">1</value>
9012 9012
                      <value _ptr_="0xc907b08" type="list" content-type="string" key="flags"/>
9013
                      <value type="int" key="isNotNull">1</value>
9013
                      <value type="int" key="isNotNull">0</value>
9014 9014
                      <value type="int" key="length">767</value>
9015 9015
                      <value type="int" key="precision">-1</value>
9016 9016
                      <value type="int" key="scale">-1</value>
......
9119 9119
                      <value _ptr_="0xc493500" type="list" content-type="object" content-struct-name="db.Column" key="referencedColumns">
9120 9120
                        <link type="object">be8f7b0c-a6e0-11e2-95e9-080027bcf912</link>
9121 9121
                      </value>
9122
                      <value type="int" key="referencedMandatory">1</value>
9122
                      <value type="int" key="referencedMandatory">0</value>
9123 9123
                      <value type="string" key="updateRule">CASCADE</value>
9124 9124
                      <value type="string" key="comment"></value>
9125 9125
                      <value type="string" key="name">fk_geovalidation_geoplace2</value>
......
9247 9247
                  <value type="int" key="commentedOut">0</value>
9248 9248
                  <value type="string" key="createDate">2013-04-16 14:58</value>
9249 9249
                  <value _ptr_="0xb2ac850" type="dict" key="customData"/>
9250
                  <value type="string" key="lastChangeDate">2013-07-27 10:11</value>
9250
                  <value type="string" key="lastChangeDate">2013-07-27 10:23</value>
9251 9251
                  <value type="int" key="modelOnly">0</value>
9252 9252
                  <value type="string" key="name">geovalidation</value>
9253 9253
                  <link type="object" struct-name="GrtNamedObject" key="owner">be8cb246-a6e0-11e2-95e9-080027bcf912</link>
......
14036 14036
        <link type="object" struct-name="db.mgmt.Rdbms" key="rdbms">com.mysql.rdbms.mysql</link>
14037 14037
        <value _ptr_="0xb2394c0" type="list" content-type="object" content-struct-name="db.Script" key="scripts"/>
14038 14038
        <value _ptr_="0xaa26720" type="dict" key="syncProfiles">
14039
          <value type="object" struct-name="db.mgmt.SyncProfile" id="158d5114-f6e0-11e2-b6d1-080027bcf912" struct-checksum="0xc64972c2" key="">
14040
            <value _ptr_="0xce19288" type="dict" key="lastKnownDBNames">
14039
          <value type="object" struct-name="db.mgmt.SyncProfile" id="5457deb8-f6e1-11e2-b6d1-080027bcf912" struct-checksum="0xc64972c2" key="">
14040
            <value _ptr_="0xca0cf50" type="dict" key="lastKnownDBNames">
14041 14041
              <value type="string" key="049df920-a91b-11e2-bdec-080027bcf912">organization</value>
14042 14042
              <value type="string" key="049dfc5e-a91b-11e2-bdec-080027bcf912">id</value>
14043 14043
              <value type="string" key="049dff1a-a91b-11e2-bdec-080027bcf912">info</value>
......
14467 14467
              <value type="string" key="ed1eb468-ad0e-11e2-b309-080027bcf912">institution</value>
14468 14468
              <value type="string" key="ed1ec98a-ad0e-11e2-b309-080027bcf912">fk_collection_organization1_idx</value>
14469 14469
              <value type="string" key="f62bfaf6-a797-11e2-8681-080027bcf912">fk_stem_observation_individual_observation2</value>
14470
              <value type="string" key="f6c9182a-f6e0-11e2-b6d1-080027bcf912">fk_geovalidation_record1</value>
14470 14471
              <value type="string" key="fbf69d1e-a79d-11e2-a346-080027bcf912">record_unique</value>
14471 14472
              <value type="string" key="ff7f1558-a791-11e2-84c3-080027bcf912">name</value>
14472 14473
            </value>
......
14556 14557
    <value type="object" struct-name="app.DocumentInfo" id="BEE3982F-55A1-4B2C-914A-CD6953803AB9" struct-checksum="0xbba780b8" key="info">
14557 14558
      <value type="string" key="author">Aaron Marcuse-Kubitza</value>
14558 14559
      <value type="string" key="caption">New Model</value>
14559
      <value type="string" key="dateChanged">2013-07-27 10:21</value>
14560
      <value type="string" key="dateChanged">2013-07-27 10:24</value>
14560 14561
      <value type="string" key="dateCreated">2012-01-19 14:06</value>
14561 14562
      <value type="string" key="description"></value>
14562 14563
      <value type="string" key="project">Name of the project</value>
schemas/VegCore/VegCore.my.sql
261 261
CREATE TABLE `geovalidation` (
262 262
  `id` varbinary(767) NOT NULL,
263 263
  `input_geoplace` varbinary(767) NOT NULL,
264
  `scrubbed_geoplace` varbinary(767) NOT NULL,
264
  `scrubbed_geoplace` varbinary(767) DEFAULT NULL,
265 265
  `geovalid` tinyint(1) NOT NULL,
266 266
  `lat_long_domain_valid` tinyint(1) NOT NULL,
267 267
  `lat_long_in_place_ranks` set('hstore') COLLATE utf8_bin DEFAULT NULL,
268 268
  PRIMARY KEY (`id`),
269 269
  KEY `fk_geovalidation_geoplace1_idx` (`input_geoplace`),
270 270
  KEY `fk_geovalidation_geoplace2_idx` (`scrubbed_geoplace`),
271
  CONSTRAINT `fk_geovalidation_record1` FOREIGN KEY (`id`) REFERENCES `record` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
272 271
  CONSTRAINT `fk_geovalidation_geoplace1` FOREIGN KEY (`input_geoplace`) REFERENCES `geoplace` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
273
  CONSTRAINT `fk_geovalidation_geoplace2` FOREIGN KEY (`scrubbed_geoplace`) REFERENCES `geoplace` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
272
  CONSTRAINT `fk_geovalidation_geoplace2` FOREIGN KEY (`scrubbed_geoplace`) REFERENCES `geoplace` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
273
  CONSTRAINT `fk_geovalidation_record1` FOREIGN KEY (`id`) REFERENCES `record` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
274 274
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='The accuracy of the [[VegCore#Coordinates|Coordinates]], taking into account the [[VegCore#Placename|Placename]]';
275 275
/*!40101 SET character_set_client = @saved_cs_client */;
276 276

  
schemas/VegCore/VegCore.pg.sql
263 263
CREATE TABLE "geovalidation" (
264 264
  "id" text NOT NULL,
265 265
  "input_geoplace" text NOT NULL,
266
  "scrubbed_geoplace" text NOT NULL,
266
  "scrubbed_geoplace" text DEFAULT NULL,
267 267
  "geovalid" integer NOT NULL,
268 268
  "lat_long_domain_valid" integer NOT NULL,
269 269
  "lat_long_in_place_ranks" hstore DEFAULT NULL,
270 270
  PRIMARY KEY ("id"),
271 271
  /*KEY "fk_geovalidation_geoplace1_idx" ("input_geoplace")*/CHECK (true),
272 272
  /*KEY "fk_geovalidation_geoplace2_idx" ("scrubbed_geoplace")*/CHECK (true),
273
  /*CONSTRAINT "fk_geovalidation_record1" FOREIGN KEY ("id") REFERENCES "record" ("id") ON DELETE CASCADE ON UPDATE CASCADE*/CHECK (true),
274 273
  /*CONSTRAINT "fk_geovalidation_geoplace1" FOREIGN KEY ("input_geoplace") REFERENCES "geoplace" ("id") ON DELETE CASCADE ON UPDATE CASCADE*/CHECK (true),
275
  /*CONSTRAINT "fk_geovalidation_geoplace2" FOREIGN KEY ("scrubbed_geoplace") REFERENCES "geoplace" ("id") ON DELETE CASCADE ON UPDATE CASCADE*/CHECK (true)
274
  /*CONSTRAINT "fk_geovalidation_geoplace2" FOREIGN KEY ("scrubbed_geoplace") REFERENCES "geoplace" ("id") ON DELETE CASCADE ON UPDATE CASCADE*/CHECK (true),
275
  /*CONSTRAINT "fk_geovalidation_record1" FOREIGN KEY ("id") REFERENCES "record" ("id") ON DELETE CASCADE ON UPDATE CASCADE*/CHECK (true)
276 276
) /*ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='The accuracy of the [[VegCore#Coordinates|Coordinates]], taking into account the [[VegCore#Placename|Placename]]'*/;
277 277
/*!40101 SET character_set_client = @saved_cs_client */;
278 278

  

Also available in: Unified diff