Project

General

Profile

« Previous | Next » 

Revision 10472

Added by Aaron Marcuse-Kubitza over 11 years ago

bugfix: schemas/VegCore/VegCore.ERD.mwb: geopath: made country NOT NULL so that every geoplace (for input to geovalidation) has something on the geopath side. geocoords: made latitude_deg/longitude_deg NOT NULL so that every geoplace (for input to geovalidation) has something on the geocoords side. added geocoords_unique constraint since this is a global table with one entry for each lat/long.

View differences:

schemas/VegCore/document.mwb.xml
2869 2869 
                      <value type="string" key="collationName"></value>
2870 2870 
                      <value type="string" key="datatypeExplicitParams"></value>
2871 2871 
                      <value type="string" key="defaultValue"></value>
2872 
                      <value type="int" key="defaultValueIsNull">1</value>
2872 
                      <value type="int" key="defaultValueIsNull">0</value>
2873 2873 
                      <value _ptr_="0xb2558d0" type="list" content-type="string" key="flags"/>
2874 
                      <value type="int" key="isNotNull">0</value>
2874 
                      <value type="int" key="isNotNull">1</value>
2875 2875 
                      <value type="int" key="length">767</value>
2876 2876 
                      <value type="int" key="precision">-1</value>
2877 2877 
                      <value type="int" key="scale">-1</value>
......
2888 2888 
                      <value type="string" key="collationName"></value>
2889 2889 
                      <value type="string" key="datatypeExplicitParams"></value>
2890 2890 
                      <value type="string" key="defaultValue"></value>
2891 
                      <value type="int" key="defaultValueIsNull">1</value>
2891 
                      <value type="int" key="defaultValueIsNull">0</value>
2892 2892 
                      <value _ptr_="0xb255da0" type="list" content-type="string" key="flags"/>
2893 
                      <value type="int" key="isNotNull">0</value>
2893 
                      <value type="int" key="isNotNull">1</value>
2894 2894 
                      <value type="int" key="length">767</value>
2895 2895 
                      <value type="int" key="precision">-1</value>
2896 2896 
                      <value type="int" key="scale">-1</value>
......
2930 2930 
                      <value type="string" key="oldName">PRIMARY</value>
2931 2931 
                      <link type="object" struct-name="GrtObject" key="owner">be8d4a58-a6e0-11e2-95e9-080027bcf912</link>
2932 2932 
                    </value>
2933 
                    <value type="object" struct-name="db.mysql.Index" id="1a652744-f6da-11e2-b6d1-080027bcf912" struct-checksum="0x309b847a">
2934 
                      <value _ptr_="0xc3b0460" type="list" content-type="object" content-struct-name="db.mysql.IndexColumn" key="columns">
2935 
                        <value type="object" struct-name="db.mysql.IndexColumn" id="1d48dece-f6da-11e2-b6d1-080027bcf912" struct-checksum="0x62630b3c">
2936 
                          <value type="int" key="columnLength">0</value>
2937 
                          <value type="string" key="comment"></value>
2938 
                          <value type="int" key="descend">0</value>
2939 
                          <link type="object" struct-name="db.Column" key="referencedColumn">a0266c92-a92a-11e2-93c8-080027bcf912</link>
2940 
                          <value type="string" key="name"></value>
2941 
                          <link type="object" struct-name="GrtObject" key="owner">1a652744-f6da-11e2-b6d1-080027bcf912</link>
2942 
                        </value>
2943 
                        <value type="object" struct-name="db.mysql.IndexColumn" id="1d9725c0-f6da-11e2-b6d1-080027bcf912" struct-checksum="0x62630b3c">
2944 
                          <value type="int" key="columnLength">0</value>
2945 
                          <value type="string" key="comment"></value>
2946 
                          <value type="int" key="descend">0</value>
2947 
                          <link type="object" struct-name="db.Column" key="referencedColumn">aa191bd2-a92a-11e2-93c8-080027bcf912</link>
2948 
                          <value type="string" key="name"></value>
2949 
                          <link type="object" struct-name="GrtObject" key="owner">1a652744-f6da-11e2-b6d1-080027bcf912</link>
2950 
                        </value>
2951 
                      </value>
2952 
                      <value type="string" key="indexKind"></value>
2953 
                      <value type="int" key="keyBlockSize">0</value>
2954 
                      <value type="string" key="withParser"></value>
2955 
                      <value type="string" key="comment"></value>
2956 
                      <value type="int" key="deferability">0</value>
2957 
                      <value type="string" key="indexType">INDEX</value>
2958 
                      <value type="int" key="isPrimary">0</value>
2959 
                      <value type="string" key="name">geocoords_unique</value>
2960 
                      <value type="int" key="unique">0</value>
2961 
                      <value type="string" key="oldName"></value>
2962 
                      <link type="object" struct-name="GrtObject" key="owner">be8d4a58-a6e0-11e2-95e9-080027bcf912</link>
2963 
                    </value>
2933 2964 
                  </value>
2934 2965 
                  <value type="string" key="maxRows"></value>
2935 2966 
                  <value type="string" key="mergeInsert"></value>
......
2961 2992 
                  <value type="int" key="commentedOut">0</value>
2962 2993 
                  <value type="string" key="createDate">2013-04-16 14:58</value>
2963 2994 
                  <value _ptr_="0xb254bf8" type="dict" key="customData"/>
2964 
                  <value type="string" key="lastChangeDate">2013-07-27 09:05</value>
2995 
                  <value type="string" key="lastChangeDate">2013-07-27 09:32</value>
2965 2996 
                  <value type="int" key="modelOnly">0</value>
2966 2997 
                  <value type="string" key="name">geocoords</value>
2967 2998 
                  <link type="object" struct-name="GrtNamedObject" key="owner">be8cb246-a6e0-11e2-95e9-080027bcf912</link>
......
4937 4968 
                      <value type="string" key="collationName"></value>
4938 4969 
                      <value type="string" key="datatypeExplicitParams"></value>
4939 4970 
                      <value type="string" key="defaultValue"></value>
4940 
                      <value type="int" key="defaultValueIsNull">1</value>
4971 
                      <value type="int" key="defaultValueIsNull">0</value>
4941 4972 
                      <value _ptr_="0xb2738a8" type="list" content-type="string" key="flags"/>
4942 
                      <value type="int" key="isNotNull">0</value>
4973 
                      <value type="int" key="isNotNull">1</value>
4943 4974 
                      <value type="int" key="length">767</value>
4944 4975 
                      <value type="int" key="precision">-1</value>
4945 4976 
                      <value type="int" key="scale">-1</value>
......
5086 5117 
                  <value type="int" key="commentedOut">0</value>
5087 5118 
                  <value type="string" key="createDate">2013-04-17 13:52</value>
5088 5119 
                  <value _ptr_="0xb272700" type="dict" key="customData"/>
5089 
                  <value type="string" key="lastChangeDate">2013-07-27 07:36</value>
5120 
                  <value type="string" key="lastChangeDate">2013-07-27 09:33</value>
5090 5121 
                  <value type="int" key="modelOnly">0</value>
5091 5122 
                  <value type="string" key="name">geopath</value>
5092 5123 
                  <link type="object" struct-name="GrtNamedObject" key="owner">be8cb246-a6e0-11e2-95e9-080027bcf912</link>
......
13742 13773 
              <value type="string" key="name"></value>
13743 13774 
            </value>
13744 13775 
            <value _ptr_="0xb2c2eb0" type="list" content-type="object" content-struct-name="model.Object" key="selection">
13745 
              <link type="object">286AE59E-913E-4F00-A662-693F828EFB6F</link>
13776 
              <link type="object">2E4C661D-4F5E-45E6-9290-A20ABF3BCBCD</link>
13746 13777 
            </value>
13747 13778 
            <value type="int" key="updateBlocked">0</value>
13748 13779 
            <value type="real" key="width">1.6215e+03</value>
......
13756 13787 
        <link type="object" struct-name="db.mgmt.Rdbms" key="rdbms">com.mysql.rdbms.mysql</link>
13757 13788 
        <value _ptr_="0xb2394c0" type="list" content-type="object" content-struct-name="db.Script" key="scripts"/>
13758 13789 
        <value _ptr_="0xaa26720" type="dict" key="syncProfiles">
13759 
          <value type="object" struct-name="db.mgmt.SyncProfile" id="c7a2393a-f6d8-11e2-b6d1-080027bcf912" struct-checksum="0xc64972c2" key="">
13760 
            <value _ptr_="0xc8ae978" type="dict" key="lastKnownDBNames">
13790 
          <value type="object" struct-name="db.mgmt.SyncProfile" id="78dea35a-f6d9-11e2-b6d1-080027bcf912" struct-checksum="0xc64972c2" key="">
13791 
            <value _ptr_="0xc410858" type="dict" key="lastKnownDBNames">
13761 13792 
              <value type="string" key="049df920-a91b-11e2-bdec-080027bcf912">organization</value>
13762 13793 
              <value type="string" key="049dfc5e-a91b-11e2-bdec-080027bcf912">id</value>
13763 13794 
              <value type="string" key="049dff1a-a91b-11e2-bdec-080027bcf912">info</value>
......
14267 14298 
    <value type="object" struct-name="app.DocumentInfo" id="BEE3982F-55A1-4B2C-914A-CD6953803AB9" struct-checksum="0xbba780b8" key="info">
14268 14299 
      <value type="string" key="author">Aaron Marcuse-Kubitza</value>
14269 14300 
      <value type="string" key="caption">New Model</value>
14270 
      <value type="string" key="dateChanged">2013-07-27 09:27</value>
14301 
      <value type="string" key="dateChanged">2013-07-27 09:42</value>
14271 14302 
      <value type="string" key="dateCreated">2012-01-19 14:06</value>
14272 14303 
      <value type="string" key="description"></value>
14273 14304 
      <value type="string" key="project">Name of the project</value>
schemas/VegCore/VegCore.my.sql
165 165 
/*!40101 SET character_set_client = utf8 */;
166 166 
CREATE TABLE `geocoords` (
167 167 
  `id` varbinary(767) NOT NULL,
168 
  `latitude_deg` varbinary(767) DEFAULT NULL,
169 
  `longitude_deg` varbinary(767) DEFAULT NULL,
170 
  PRIMARY KEY (`id`)
168 
  `latitude_deg` varbinary(767) NOT NULL,
169 
  `longitude_deg` varbinary(767) NOT NULL,
170 
  PRIMARY KEY (`id`),
171 
  KEY `geocoords_unique` (`latitude_deg`,`longitude_deg`)
171 172 
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='A numerically-defined point';
172 173 
/*!40101 SET character_set_client = @saved_cs_client */;
173 174 

  		




  ......




  209
  210
  
    
CREATE TABLE `geopath` (


  		




  210
  211
  
    
  `id` varbinary(767) NOT NULL,


  		




  211
  212
  
    
  `continent` varbinary(767) DEFAULT NULL,


  		




  212
  
  
    
  `country` varbinary(767) DEFAULT NULL,


  		




  
  213
  
    
  `country` varbinary(767) NOT NULL,


  		




  213
  214
  
    
  `state_province` varbinary(767) DEFAULT NULL,


  		




  214
  215
  
    
  `county` varbinary(767) DEFAULT NULL,


  		




  215
  216
  
    
  `municipality` varbinary(767) DEFAULT NULL,


  		












  

    
      schemas/VegCore/VegCore.pg.sql
    
  





  167
  167
  
    
/*!40101 SET character_set_client = utf8 */;


  		




  168
  168
  
    
CREATE TABLE "geocoords" (


  		




  169
  169
  
    
  "id" text NOT NULL,


  		




  170
  
  
    
  "latitude_deg" text DEFAULT NULL,


  		




  171
  
  
    
  "longitude_deg" text DEFAULT NULL,


  		




  172
  
  
    
  PRIMARY KEY ("id")


  		




  
  170
  
    
  "latitude_deg" text NOT NULL,


  		




  
  171
  
    
  "longitude_deg" text NOT NULL,


  		




  
  172
  
    
  PRIMARY KEY ("id"),


  		




  
  173
  
    
  /*KEY "geocoords_unique" ("latitude_deg","longitude_deg")*/CHECK (true)


  		




  173
  174
  
    
) /*ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='A numerically-defined point'*/;


  		




  174
  175
  
    
/*!40101 SET character_set_client = @saved_cs_client */;


  		




  175
  176
  
    

  		




  ......




  211
  212
  
    
CREATE TABLE "geopath" (


  		




  212
  213
  
    
  "id" text NOT NULL,


  		




  213
  214
  
    
  "continent" text DEFAULT NULL,


  		




  214
  
  
    
  "country" text DEFAULT NULL,


  		




  
  215
  
    
  "country" text NOT NULL,


  		




  215
  216
  
    
  "state_province" text DEFAULT NULL,


  		




  216
  217
  
    
  "county" text DEFAULT NULL,


  		




  217
  218
  
    
  "municipality" text DEFAULT NULL,


  		












Also available in:  Unified diff