Download as
Browse Code »

Commit d32cd45327cb95a684cf8ab67708c59b468e3caa

Authored by Edmar Moretti
1 parent a9bfeed7
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correção na coluna identificador da tabela de regiões do sistema de administraçã… 

…o. O tipo foi alterado de integer para text
Showing 8 changed files with 854 additions and 518 deletions   Show diff stats
admin/admin.db
View file @d32cd45
No preview for this file type
admin/js/estat_tipo_regiao.js
  Diff comments   View file @d32cd45
... ... @@ -314,7 +314,7 @@ function montaDiv(i){
314 314 $i("editor_bd2").innerHTML = ins;
315 315 if($i("Ccodigo_estat_conexao")){
316 316 temp = "<select id='Ecodigo_estat_conexao' >";
317   - temp += core_comboObjeto(dadosAuxiliares.conexao,"codigo_estat_conexao","bancodedados",i.codigo_estat_conexao);
  317 + temp += core_comboObjeto(dadosAuxiliares.conexaoregistrada,"codigo_estat_conexao","bancodedados",i.codigo_estat_conexao);
318 318 temp += "</select>";
319 319 $i("Ccodigo_estat_conexao").innerHTML = temp;
320 320 }
... ...
admin/js/estat_variavel.js
  Diff comments   View file @d32cd45
... ... @@ -359,7 +359,7 @@ i3GEOadmin.variaveis = {
359 359 }
360 360 if($i("Ccodigo_estat_conexao")){
361 361 temp = "<select id='Ecodigo_estat_conexao' >";
362   - temp += core_comboObjeto(i3GEOadmin.variaveis.dadosAuxiliares.conexao,"codigo_estat_conexao","bancodedados",i.codigo_estat_conexao);
  362 + temp += core_comboObjeto(i3GEOadmin.variaveis.dadosAuxiliares.conexaoregistrada,"codigo_estat_conexao","bancodedados",i.codigo_estat_conexao);
363 363 temp += "</select>";
364 364 $i("Ccodigo_estat_conexao").innerHTML = temp;
365 365 }
... ...
admin/php/classe_metaestat.php
  Diff comments   View file @d32cd45
... ... @@ -1496,6 +1496,7 @@ class Metaestat{
1496 1496 $apelidos = utf8_encode($apelidos);
1497 1497 }
1498 1498 //echo "UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET codigo_estat_conexao = '$codigo_estat_conexao', colunacentroide = '$colunacentroide',nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid', colunasvisiveis = '$colunasvisiveis', apelidos = '$apelidos' WHERE codigo_tipo_regiao = $codigo_tipo_regiao";exit;
  1499 + //exit;
1499 1500 $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_tipo_regiao SET codigo_estat_conexao = '$codigo_estat_conexao', colunacentroide = '$colunacentroide',nome_tipo_regiao = '$nome_tipo_regiao',descricao_tipo_regiao = '$descricao_tipo_regiao',esquemadb = '$esquemadb',tabela = '$tabela',colunageo = '$colunageo',data = '$data',identificador = '$identificador',colunanomeregiao = '$colunanomeregiao', srid = '$srid', colunasvisiveis = '$colunasvisiveis', apelidos = '$apelidos' WHERE codigo_tipo_regiao = $codigo_tipo_regiao");
1500 1501 $retorna = $codigo_tipo_regiao;
1501 1502 }
... ... @@ -1835,8 +1836,9 @@ class Metaestat{
1835 1836 * Lista os dados de uma conexao ou de todas
1836 1837 * @param id da conexao
1837 1838 * @param boolean inclui na lista a senha ou nao
  1839 + * @param boolean inclui as conexoes definidas em postgis_mapa (ms_configura.php)
1838 1840 */
1839   - function listaConexao($codigo_estat_conexao="",$senha=false){
  1841 + function listaConexao($codigo_estat_conexao="",$senha=false,$incluiPostgisMapa=true){
1840 1842 if($senha == true){
1841 1843 $colunas = "codigo_estat_conexao, bancodedados, host, porta, usuario, senha";
1842 1844 }
... ... @@ -1861,31 +1863,33 @@ class Metaestat{
1861 1863 }
1862 1864 }
1863 1865 //obtem as conexoes definidas em ms_configgura.php
1864   - if(!isset($postgis_mapa)){
1865   - require(dirname(__FILE__)."/../../ms_configura.php");
1866   - }
1867   - if(!empty($postgis_mapa)){
1868   - foreach(array_keys($postgis_mapa) as $key){
1869   - $lista = explode(" ",$postgis_mapa[$key]);
1870   - $con = array();
1871   - foreach($lista as $l){
1872   - $teste = explode("=",$l);
1873   - $con[trim($teste[0])] = trim($teste[1]);
1874   - }
1875   - $c = array(
1876   - "codigo_estat_conexao" => $key,
1877   - "bancodedados" => $con["dbname"],
1878   - "host" => $con["host"],
1879   - "porta" => $con["port"],
1880   - "usuario" => $con["user"],
1881   - "fonte" => "ms_configura"
1882   - );
1883   - if($senha == true){
1884   - $c["senha"] = $con["password"];
1885   - }
1886   - $res[] = $c;
1887   - if($codigo_estat_conexao != "" && $codigo_estat_conexao == $key){
1888   - return $c;
  1866 + if($incluiPostgisMapa == true){
  1867 + if(!isset($postgis_mapa)){
  1868 + require(dirname(__FILE__)."/../../ms_configura.php");
  1869 + }
  1870 + if(!empty($postgis_mapa)){
  1871 + foreach(array_keys($postgis_mapa) as $key){
  1872 + $lista = explode(" ",$postgis_mapa[$key]);
  1873 + $con = array();
  1874 + foreach($lista as $l){
  1875 + $teste = explode("=",$l);
  1876 + $con[trim($teste[0])] = trim($teste[1]);
  1877 + }
  1878 + $c = array(
  1879 + "codigo_estat_conexao" => $key,
  1880 + "bancodedados" => $con["dbname"],
  1881 + "host" => $con["host"],
  1882 + "porta" => $con["port"],
  1883 + "usuario" => $con["user"],
  1884 + "fonte" => "ms_configura"
  1885 + );
  1886 + if($senha == true){
  1887 + $c["senha"] = $con["password"];
  1888 + }
  1889 + $res[] = $c;
  1890 + if($codigo_estat_conexao != "" && $codigo_estat_conexao == $key){
  1891 + return $c;
  1892 + }
1889 1893 }
1890 1894 }
1891 1895 }
... ...
admin/php/criabanco.php
  Diff comments   View file @d32cd45
... ... @@ -84,7 +84,7 @@
84 84 "CREATE TABLE ".$esquemaadmin."i3geousr_grupos (id_grupo INTEGER PRIMARY KEY, nome TEXT, descricao TEXT)",
85 85 //tabelas do sistema metaestat
86 86 "create table ".$esquemaadmin."i3geoestat_conexao (codigo_estat_conexao INTEGER PRIMARY KEY,bancodedados text,host text,porta text,usuario text,senha text)",
87   - "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao INTEGER PRIMARY KEY,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador integer,colunanomeregiao text,srid text,colunacentroide text, colunasvisiveis text, apelidos text)",
  87 + "create table ".$esquemaadmin."i3geoestat_tipo_regiao(codigo_tipo_regiao INTEGER PRIMARY KEY,nome_tipo_regiao text,descricao_tipo_regiao text,codigo_estat_conexao integer,esquemadb text,tabela text,colunageo text,data text,identificador text,colunanomeregiao text,srid text,colunacentroide text, colunasvisiveis text, apelidos text)",
88 88 "create table ".$esquemaadmin."i3geoestat_agregaregiao(id_agregaregiao INTEGER PRIMARY KEY,codigo_tipo_regiao integer,codigo_tipo_regiao_pai integer,colunaligacao_regiaopai text)",
89 89 "create table ".$esquemaadmin."i3geoestat_tipo_periodo(codigo_tipo_periodo INTEGER PRIMARY KEY,nome text,descricao text)",
90 90 "create table ".$esquemaadmin."i3geoestat_unidade_medida(codigo_unidade_medida INTEGER PRIMARY KEY,nome text,sigla text,permitesoma integer default 0,permitemedia integer default 0)",
... ...
admin/php/metaestat.php
  Diff comments   View file @d32cd45
... ... @@ -1169,6 +1169,7 @@ switch (strtoupper($funcao))
1169 1169 $resultado["unidade_medida"] = $m->listaUnidadeMedida();
1170 1170 $resultado["tipo_regiao"] = $m->listaTipoRegiao();
1171 1171 $resultado["conexao"] = $m->listaConexao();
  1172 + $resultado["conexaoregistrada"] = $m->listaConexao("",false,false);
1172 1173 $resultado["fonteinfo"] = $m->listaFonteinfo();
1173 1174 retornaJSON($resultado);
1174 1175 break;
... ...
admin/sql/metaestat.sql
  Diff comments   View file @d32cd45
... ... @@ -57,7 +57,7 @@ create table i3geoestat_tipo_regiao
57 57 -- data do mapeamento da região
58 58 data text,
59 59 -- id da tabela onde está a coluna com a geometria e que identifica a região de forma única
60   - identificador integer,
  60 + identificador text,
61 61 -- coluna que contém o nome de cada região ou local
62 62 colunanomeregiao text,
63 63 -- código srid correspondente à projeção cartográfica da coluna com a geometria
... ...
documentacao/diagramas/metaestat.erm
  Diff comments   View file @d32cd45
... ... @@ -11,8 +11,8 @@
11 11 </page_setting>
12 12 <category_index>0</category_index>
13 13 <zoom>1.0</zoom>
14   - <x>203</x>
15   - <y>262</y>
  14 + <x>-362</x>
  15 + <y>81</y>
16 16 <default_color>
17 17 <r>255</r>
18 18 <g>128</g>
... ... @@ -41,6 +41,7 @@
41 41 <suspend_validator>false</suspend_validator>
42 42 <export_setting>
43 43 <category_name_to_export>All</category_name_to_export>
  44 + <html_output></html_output>
44 45 <ddl_output>/var/www/i3geo/admin/sql/metaestat.sql</ddl_output>
45 46 <excel_output></excel_output>
46 47 <excel_template></excel_template>
... ... @@ -110,7 +111,7 @@
110 111 </connections>
111 112 <display>false</display>
112 113 <creation_date>2012-07-17 15:03:53</creation_date>
113   - <updated_date>2013-01-14 19:30:51</updated_date>
  114 + <updated_date>2014-10-02 18:40:15</updated_date>
114 115 <model_property>
115 116 <name>Project Name</name>
116 117 <value></value>
... ... @@ -150,6 +151,8 @@
150 151 <array>false</array>
151 152 <array_dimension>null</array_dimension>
152 153 <unsigned>false</unsigned>
  154 + <zerofill>false</zerofill>
  155 + <binary>false</binary>
153 156 <args></args>
154 157 <description>Apelidos das colunas visíveis. Deve estar na mesma ordem das colunas visíveis e separados por vírgulas. Opcional.</description>
155 158 <logical_name>apelidos</logical_name>
... ... @@ -163,6 +166,8 @@
163 166 <array>false</array>
164 167 <array_dimension>null</array_dimension>
165 168 <unsigned>false</unsigned>
  169 + <zerofill>false</zerofill>
  170 + <binary>false</binary>
166 171 <args></args>
167 172 <description>componente B da cor utilizada para representar a classe</description>
168 173 <logical_name>azul</logical_name>
... ... @@ -176,6 +181,8 @@
176 181 <array>false</array>
177 182 <array_dimension>null</array_dimension>
178 183 <unsigned>false</unsigned>
  184 + <zerofill>false</zerofill>
  185 + <binary>false</binary>
179 186 <args></args>
180 187 <description>Nome do banco de dados</description>
181 188 <logical_name>bancodedados</logical_name>
... ... @@ -189,6 +196,8 @@
189 196 <array>false</array>
190 197 <array_dimension>null</array_dimension>
191 198 <unsigned>false</unsigned>
  199 + <zerofill>false</zerofill>
  200 + <binary>false</binary>
192 201 <args></args>
193 202 <description></description>
194 203 <logical_name>codigo_estat_conexao</logical_name>
... ... @@ -202,6 +211,8 @@
202 211 <array>false</array>
203 212 <array_dimension>null</array_dimension>
204 213 <unsigned>false</unsigned>
  214 + <zerofill>false</zerofill>
  215 + <binary>false</binary>
205 216 <args></args>
206 217 <description></description>
207 218 <logical_name>codigo_tipo_periodo</logical_name>
... ... @@ -215,6 +226,8 @@
215 226 <array>false</array>
216 227 <array_dimension>null</array_dimension>
217 228 <unsigned>false</unsigned>
  229 + <zerofill>false</zerofill>
  230 + <binary>false</binary>
218 231 <args></args>
219 232 <description></description>
220 233 <logical_name>codigo_tipo_regiao</logical_name>
... ... @@ -228,6 +241,8 @@
228 241 <array>false</array>
229 242 <array_dimension>null</array_dimension>
230 243 <unsigned>false</unsigned>
  244 + <zerofill>false</zerofill>
  245 + <binary>false</binary>
231 246 <args></args>
232 247 <description></description>
233 248 <logical_name>codigo_tipo_regiao_pai</logical_name>
... ... @@ -241,6 +256,8 @@
241 256 <array>false</array>
242 257 <array_dimension>null</array_dimension>
243 258 <unsigned>false</unsigned>
  259 + <zerofill>false</zerofill>
  260 + <binary>false</binary>
244 261 <args></args>
245 262 <description></description>
246 263 <logical_name>codigo_unidade_medida</logical_name>
... ... @@ -254,6 +271,8 @@
254 271 <array>false</array>
255 272 <array_dimension>null</array_dimension>
256 273 <unsigned>false</unsigned>
  274 + <zerofill>false</zerofill>
  275 + <binary>false</binary>
257 276 <args></args>
258 277 <description></description>
259 278 <logical_name>codigo_variavel</logical_name>
... ... @@ -267,6 +286,8 @@
267 286 <array>false</array>
268 287 <array_dimension>null</array_dimension>
269 288 <unsigned>false</unsigned>
  289 + <zerofill>false</zerofill>
  290 + <binary>false</binary>
270 291 <args></args>
271 292 <description></description>
272 293 <logical_name>coluna</logical_name>
... ... @@ -280,6 +301,8 @@
280 301 <array>false</array>
281 302 <array_dimension>null</array_dimension>
282 303 <unsigned>false</unsigned>
  304 + <zerofill>false</zerofill>
  305 + <binary>false</binary>
283 306 <args></args>
284 307 <description>Coluna que contém um ponto que representa cada local. Pode ser o mesmo que colunageo</description>
285 308 <logical_name>colunacentroide</logical_name>
... ... @@ -293,6 +316,8 @@
293 316 <array>false</array>
294 317 <array_dimension>null</array_dimension>
295 318 <unsigned>false</unsigned>
  319 + <zerofill>false</zerofill>
  320 + <binary>false</binary>
296 321 <args></args>
297 322 <description>Coluna com a geometria da região</description>
298 323 <logical_name>colunageo</logical_name>
... ... @@ -306,6 +331,8 @@
306 331 <array>false</array>
307 332 <array_dimension>null</array_dimension>
308 333 <unsigned>false</unsigned>
  334 + <zerofill>false</zerofill>
  335 + <binary>false</binary>
309 336 <args></args>
310 337 <description>Nome da coluna, na mesma tabela onde estão os valores, que identifica unicamente a região geográfica</description>
311 338 <logical_name>colunaidgeo</logical_name>
... ... @@ -319,6 +346,8 @@
319 346 <array>false</array>
320 347 <array_dimension>null</array_dimension>
321 348 <unsigned>false</unsigned>
  349 + <zerofill>false</zerofill>
  350 + <binary>false</binary>
322 351 <args></args>
323 352 <description>Nome da coluna da tabela que contem os dados e que é um identificador único de cada registro</description>
324 353 <logical_name>colunaidunico</logical_name>
... ... @@ -332,6 +361,8 @@
332 361 <array>false</array>
333 362 <array_dimension>null</array_dimension>
334 363 <unsigned>false</unsigned>
  364 + <zerofill>false</zerofill>
  365 + <binary>false</binary>
335 366 <args></args>
336 367 <description>Coluna na tabela filho que liga com a coluna de identificadores da coluna pai</description>
337 368 <logical_name>colunaligacao_regiaopai</logical_name>
... ... @@ -345,6 +376,8 @@
345 376 <array>false</array>
346 377 <array_dimension>null</array_dimension>
347 378 <unsigned>false</unsigned>
  379 + <zerofill>false</zerofill>
  380 + <binary>false</binary>
348 381 <args></args>
349 382 <description>Coluna que contém o nome de cada região ou local</description>
350 383 <logical_name>colunanomeregiao</logical_name>
... ... @@ -358,6 +391,8 @@
358 391 <array>false</array>
359 392 <array_dimension>null</array_dimension>
360 393 <unsigned>false</unsigned>
  394 + <zerofill>false</zerofill>
  395 + <binary>false</binary>
361 396 <args></args>
362 397 <description>Lista de noes de colunas que ficarão visíveis quando os SQL de acesso aos dados forem montados</description>
363 398 <logical_name>colunasvisiveis</logical_name>
... ... @@ -371,6 +406,8 @@
371 406 <array>false</array>
372 407 <array_dimension>null</array_dimension>
373 408 <unsigned>false</unsigned>
  409 + <zerofill>false</zerofill>
  410 + <binary>false</binary>
374 411 <args></args>
375 412 <description>Nome da colouna que contém os valores da variável</description>
376 413 <logical_name>colunavalor</logical_name>
... ... @@ -384,6 +421,8 @@
384 421 <array>false</array>
385 422 <array_dimension>null</array_dimension>
386 423 <unsigned>false</unsigned>
  424 + <zerofill>false</zerofill>
  425 + <binary>false</binary>
387 426 <args></args>
388 427 <description>Data do mapeamento da região</description>
389 428 <logical_name>data</logical_name>
... ... @@ -397,6 +436,8 @@
397 436 <array>false</array>
398 437 <array_dimension>null</array_dimension>
399 438 <unsigned>false</unsigned>
  439 + <zerofill>false</zerofill>
  440 + <binary>false</binary>
400 441 <args></args>
401 442 <description></description>
402 443 <logical_name>descricao</logical_name>
... ... @@ -410,6 +451,8 @@
410 451 <array>false</array>
411 452 <array_dimension>null</array_dimension>
412 453 <unsigned>false</unsigned>
  454 + <zerofill>false</zerofill>
  455 + <binary>false</binary>
413 456 <args></args>
414 457 <description></description>
415 458 <logical_name>descricao</logical_name>
... ... @@ -423,6 +466,8 @@
423 466 <array>false</array>
424 467 <array_dimension>null</array_dimension>
425 468 <unsigned>false</unsigned>
  469 + <zerofill>false</zerofill>
  470 + <binary>false</binary>
426 471 <args></args>
427 472 <description></description>
428 473 <logical_name>descricao</logical_name>
... ... @@ -436,6 +481,8 @@
436 481 <array>false</array>
437 482 <array_dimension>null</array_dimension>
438 483 <unsigned>false</unsigned>
  484 + <zerofill>false</zerofill>
  485 + <binary>false</binary>
439 486 <args></args>
440 487 <description></description>
441 488 <logical_name>descricao_tipo_regiao</logical_name>
... ... @@ -449,6 +496,8 @@
449 496 <array>false</array>
450 497 <array_dimension>null</array_dimension>
451 498 <unsigned>false</unsigned>
  499 + <zerofill>false</zerofill>
  500 + <binary>false</binary>
452 501 <args></args>
453 502 <description>Esquema no banco de dados que contem a tabela</description>
454 503 <logical_name>esquemadb</logical_name>
... ... @@ -462,6 +511,8 @@
462 511 <array>false</array>
463 512 <array_dimension>null</array_dimension>
464 513 <unsigned>false</unsigned>
  514 + <zerofill>false</zerofill>
  515 + <binary>false</binary>
465 516 <args></args>
466 517 <description>Esquema onde encontra-se a tabela com a geometria</description>
467 518 <logical_name>esquemadb</logical_name>
... ... @@ -475,6 +526,8 @@
475 526 <array>false</array>
476 527 <array_dimension>null</array_dimension>
477 528 <unsigned>false</unsigned>
  529 + <zerofill>false</zerofill>
  530 + <binary>false</binary>
478 531 <args></args>
479 532 <description>Expressao no formato válido do Mapserver que define os componentes da classe</description>
480 533 <logical_name>expressao</logical_name>
... ... @@ -488,6 +541,8 @@
488 541 <array>false</array>
489 542 <array_dimension>null</array_dimension>
490 543 <unsigned>false</unsigned>
  544 + <zerofill>false</zerofill>
  545 + <binary>false</binary>
491 546 <args></args>
492 547 <description>Filtro opcional que será utilizado na cláusula WHERE</description>
493 548 <logical_name>filtro</logical_name>
... ... @@ -501,6 +556,8 @@
501 556 <array>false</array>
502 557 <array_dimension>null</array_dimension>
503 558 <unsigned>false</unsigned>
  559 + <zerofill>false</zerofill>
  560 + <binary>false</binary>
504 561 <args></args>
505 562 <description>Endereço do servidor</description>
506 563 <logical_name>host</logical_name>
... ... @@ -514,11 +571,13 @@
514 571 <array>false</array>
515 572 <array_dimension>null</array_dimension>
516 573 <unsigned>false</unsigned>
  574 + <zerofill>false</zerofill>
  575 + <binary>false</binary>
517 576 <args></args>
518   - <description>ID da tabela onde está a coluna com a geometria e que identifica a região de forma única</description>
  577 + <description>Coluna que identifica a região de forma única</description>
519 578 <logical_name>identificador</logical_name>
520 579 <physical_name>identificador</physical_name>
521   - <type>integer</type>
  580 + <type>text</type>
522 581 </word>
523 582 <word>
524 583 <id>29</id>
... ... @@ -527,6 +586,8 @@
527 586 <array>false</array>
528 587 <array_dimension>null</array_dimension>
529 588 <unsigned>false</unsigned>
  589 + <zerofill>false</zerofill>
  590 + <binary>false</binary>
530 591 <args></args>
531 592 <description></description>
532 593 <logical_name>id_agregaregiao</logical_name>
... ... @@ -540,6 +601,8 @@
540 601 <array>false</array>
541 602 <array_dimension>null</array_dimension>
542 603 <unsigned>false</unsigned>
  604 + <zerofill>false</zerofill>
  605 + <binary>false</binary>
543 606 <args></args>
544 607 <description></description>
545 608 <logical_name>id_classe</logical_name>
... ... @@ -553,6 +616,8 @@
553 616 <array>false</array>
554 617 <array_dimension>null</array_dimension>
555 618 <unsigned>false</unsigned>
  619 + <zerofill>false</zerofill>
  620 + <binary>false</binary>
556 621 <args></args>
557 622 <description></description>
558 623 <logical_name>id_classificacao</logical_name>
... ... @@ -566,6 +631,8 @@
566 631 <array>false</array>
567 632 <array_dimension>null</array_dimension>
568 633 <unsigned>false</unsigned>
  634 + <zerofill>false</zerofill>
  635 + <binary>false</binary>
569 636 <args></args>
570 637 <description></description>
571 638 <logical_name>id_fonteinfo</logical_name>
... ... @@ -579,6 +646,8 @@
579 646 <array>false</array>
580 647 <array_dimension>null</array_dimension>
581 648 <unsigned>false</unsigned>
  649 + <zerofill>false</zerofill>
  650 + <binary>false</binary>
582 651 <args></args>
583 652 <description></description>
584 653 <logical_name>id_link</logical_name>
... ... @@ -592,6 +661,8 @@
592 661 <array>false</array>
593 662 <array_dimension>null</array_dimension>
594 663 <unsigned>false</unsigned>
  664 + <zerofill>false</zerofill>
  665 + <binary>false</binary>
595 666 <args></args>
596 667 <description>Identificador unico do mapa</description>
597 668 <logical_name>id_mapa</logical_name>
... ... @@ -605,6 +676,8 @@
605 676 <array>false</array>
606 677 <array_dimension>null</array_dimension>
607 678 <unsigned>false</unsigned>
  679 + <zerofill>false</zerofill>
  680 + <binary>false</binary>
608 681 <args></args>
609 682 <description></description>
610 683 <logical_name>id_mapa_grupo</logical_name>
... ... @@ -618,6 +691,8 @@
618 691 <array>false</array>
619 692 <array_dimension>null</array_dimension>
620 693 <unsigned>false</unsigned>
  694 + <zerofill>false</zerofill>
  695 + <binary>false</binary>
621 696 <args></args>
622 697 <description></description>
623 698 <logical_name>id_mapa_tema</logical_name>
... ... @@ -631,6 +706,8 @@
631 706 <array>false</array>
632 707 <array_dimension>null</array_dimension>
633 708 <unsigned>false</unsigned>
  709 + <zerofill>false</zerofill>
  710 + <binary>false</binary>
634 711 <args></args>
635 712 <description></description>
636 713 <logical_name>id_medida_variavel</logical_name>
... ... @@ -644,6 +721,8 @@
644 721 <array>false</array>
645 722 <array_dimension>null</array_dimension>
646 723 <unsigned>false</unsigned>
  724 + <zerofill>false</zerofill>
  725 + <binary>false</binary>
647 726 <args></args>
648 727 <description>(0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida</description>
649 728 <logical_name>id_pai</logical_name>
... ... @@ -657,6 +736,8 @@
657 736 <array>false</array>
658 737 <array_dimension>null</array_dimension>
659 738 <unsigned>false</unsigned>
  739 + <zerofill>false</zerofill>
  740 + <binary>false</binary>
660 741 <args></args>
661 742 <description></description>
662 743 <logical_name>id_parametro_medida</logical_name>
... ... @@ -670,6 +751,8 @@
670 751 <array>false</array>
671 752 <array_dimension>null</array_dimension>
672 753 <unsigned>false</unsigned>
  754 + <zerofill>false</zerofill>
  755 + <binary>false</binary>
673 756 <args></args>
674 757 <description></description>
675 758 <logical_name>link</logical_name>
... ... @@ -683,6 +766,8 @@
683 766 <array>false</array>
684 767 <array_dimension>null</array_dimension>
685 768 <unsigned>false</unsigned>
  769 + <zerofill>false</zerofill>
  770 + <binary>false</binary>
686 771 <args></args>
687 772 <description></description>
688 773 <logical_name>link</logical_name>
... ... @@ -696,6 +781,8 @@
696 781 <array>false</array>
697 782 <array_dimension>null</array_dimension>
698 783 <unsigned>false</unsigned>
  784 + <zerofill>false</zerofill>
  785 + <binary>false</binary>
699 786 <args></args>
700 787 <description>nome ddo logo localizado a direita do mapa</description>
701 788 <logical_name>logodireito</logical_name>
... ... @@ -709,6 +796,8 @@
709 796 <array>false</array>
710 797 <array_dimension>null</array_dimension>
711 798 <unsigned>false</unsigned>
  799 + <zerofill>false</zerofill>
  800 + <binary>false</binary>
712 801 <args></args>
713 802 <description>nome do logo localizado a esquerda do mapa</description>
714 803 <logical_name>logoesquerdo</logical_name>
... ... @@ -722,6 +811,8 @@
722 811 <array>false</array>
723 812 <array_dimension>null</array_dimension>
724 813 <unsigned>false</unsigned>
  814 + <zerofill>false</zerofill>
  815 + <binary>false</binary>
725 816 <args></args>
726 817 <description></description>
727 818 <logical_name>nome</logical_name>
... ... @@ -735,6 +826,8 @@
735 826 <array>false</array>
736 827 <array_dimension>null</array_dimension>
737 828 <unsigned>false</unsigned>
  829 + <zerofill>false</zerofill>
  830 + <binary>false</binary>
738 831 <args></args>
739 832 <description></description>
740 833 <logical_name>nome</logical_name>
... ... @@ -748,6 +841,8 @@
748 841 <array>false</array>
749 842 <array_dimension>null</array_dimension>
750 843 <unsigned>false</unsigned>
  844 + <zerofill>false</zerofill>
  845 + <binary>false</binary>
751 846 <args></args>
752 847 <description></description>
753 848 <logical_name>nome</logical_name>
... ... @@ -761,6 +856,8 @@
761 856 <array>false</array>
762 857 <array_dimension>null</array_dimension>
763 858 <unsigned>false</unsigned>
  859 + <zerofill>false</zerofill>
  860 + <binary>false</binary>
764 861 <args></args>
765 862 <description></description>
766 863 <logical_name>nome</logical_name>
... ... @@ -774,6 +871,8 @@
774 871 <array>false</array>
775 872 <array_dimension>null</array_dimension>
776 873 <unsigned>false</unsigned>
  874 + <zerofill>false</zerofill>
  875 + <binary>false</binary>
777 876 <args></args>
778 877 <description></description>
779 878 <logical_name>nome</logical_name>
... ... @@ -787,6 +886,8 @@
787 886 <array>false</array>
788 887 <array_dimension>null</array_dimension>
789 888 <unsigned>false</unsigned>
  889 + <zerofill>false</zerofill>
  890 + <binary>false</binary>
790 891 <args></args>
791 892 <description></description>
792 893 <logical_name>nome</logical_name>
... ... @@ -800,6 +901,8 @@
800 901 <array>false</array>
801 902 <array_dimension>null</array_dimension>
802 903 <unsigned>false</unsigned>
  904 + <zerofill>false</zerofill>
  905 + <binary>false</binary>
803 906 <args></args>
804 907 <description>Titulo da medida</description>
805 908 <logical_name>nomemedida</logical_name>
... ... @@ -813,6 +916,8 @@
813 916 <array>false</array>
814 917 <array_dimension>null</array_dimension>
815 918 <unsigned>false</unsigned>
  919 + <zerofill>false</zerofill>
  920 + <binary>false</binary>
816 921 <args></args>
817 922 <description></description>
818 923 <logical_name>nome_tipo_regiao</logical_name>
... ... @@ -826,6 +931,8 @@
826 931 <array>false</array>
827 932 <array_dimension>null</array_dimension>
828 933 <unsigned>false</unsigned>
  934 + <zerofill>false</zerofill>
  935 + <binary>false</binary>
829 936 <args></args>
830 937 <description>Componente azul da cor do outline</description>
831 938 <logical_name>oazul</logical_name>
... ... @@ -839,6 +946,8 @@
839 946 <array>false</array>
840 947 <array_dimension>null</array_dimension>
841 948 <unsigned>false</unsigned>
  949 + <zerofill>false</zerofill>
  950 + <binary>false</binary>
842 951 <args></args>
843 952 <description>Observacao sobre a classificação</description>
844 953 <logical_name>observacao</logical_name>
... ... @@ -852,6 +961,8 @@
852 961 <array>false</array>
853 962 <array_dimension>null</array_dimension>
854 963 <unsigned>false</unsigned>
  964 + <zerofill>false</zerofill>
  965 + <binary>false</binary>
855 966 <args></args>
856 967 <description>Largura da linha do outline</description>
857 968 <logical_name>otamanho</logical_name>
... ... @@ -865,6 +976,8 @@
865 976 <array>false</array>
866 977 <array_dimension>null</array_dimension>
867 978 <unsigned>false</unsigned>
  979 + <zerofill>false</zerofill>
  980 + <binary>false</binary>
868 981 <args></args>
869 982 <description>Componente verde da cor do outline</description>
870 983 <logical_name>overde</logical_name>
... ... @@ -878,6 +991,8 @@
878 991 <array>false</array>
879 992 <array_dimension>null</array_dimension>
880 993 <unsigned>false</unsigned>
  994 + <zerofill>false</zerofill>
  995 + <binary>false</binary>
881 996 <args></args>
882 997 <description>Componente vermelho da cor do outline</description>
883 998 <logical_name>overmelho</logical_name>
... ... @@ -891,6 +1006,8 @@
891 1006 <array>false</array>
892 1007 <array_dimension>null</array_dimension>
893 1008 <unsigned>false</unsigned>
  1009 + <zerofill>false</zerofill>
  1010 + <binary>false</binary>
894 1011 <args></args>
895 1012 <description>O tipo de unidade permite o cálculo de média aritmética? (0 ou 1)</description>
896 1013 <logical_name>permitemedia</logical_name>
... ... @@ -904,6 +1021,8 @@
904 1021 <array>false</array>
905 1022 <array_dimension>null</array_dimension>
906 1023 <unsigned>false</unsigned>
  1024 + <zerofill>false</zerofill>
  1025 + <binary>false</binary>
907 1026 <args></args>
908 1027 <description>O tipo de unidade permite que os valores sejam somados? (0 ou 1)</description>
909 1028 <logical_name>permitesoma</logical_name>
... ... @@ -917,6 +1036,8 @@
917 1036 <array>false</array>
918 1037 <array_dimension>null</array_dimension>
919 1038 <unsigned>false</unsigned>
  1039 + <zerofill>false</zerofill>
  1040 + <binary>false</binary>
920 1041 <args></args>
921 1042 <description>Porta de comunicação</description>
922 1043 <logical_name>porta</logical_name>
... ... @@ -930,6 +1051,8 @@
930 1051 <array>false</array>
931 1052 <array_dimension>null</array_dimension>
932 1053 <unsigned>false</unsigned>
  1054 + <zerofill>false</zerofill>
  1055 + <binary>false</binary>
933 1056 <args></args>
934 1057 <description>Indica se o mapa esta publicado ou nao (sim=1, nao=0)</description>
935 1058 <logical_name>publicado</logical_name>
... ... @@ -943,6 +1066,8 @@
943 1066 <array>false</array>
944 1067 <array_dimension>null</array_dimension>
945 1068 <unsigned>false</unsigned>
  1069 + <zerofill>false</zerofill>
  1070 + <binary>false</binary>
946 1071 <args></args>
947 1072 <description>Senha do usuário que pode acessar o banco</description>
948 1073 <logical_name>senha</logical_name>
... ... @@ -956,6 +1081,8 @@
956 1081 <array>false</array>
957 1082 <array_dimension>null</array_dimension>
958 1083 <unsigned>false</unsigned>
  1084 + <zerofill>false</zerofill>
  1085 + <binary>false</binary>
959 1086 <args></args>
960 1087 <description></description>
961 1088 <logical_name>sigla</logical_name>
... ... @@ -969,6 +1096,8 @@
969 1096 <array>false</array>
970 1097 <array_dimension>null</array_dimension>
971 1098 <unsigned>false</unsigned>
  1099 + <zerofill>false</zerofill>
  1100 + <binary>false</binary>
972 1101 <args></args>
973 1102 <description>Symbol name</description>
974 1103 <logical_name>simbolo</logical_name>
... ... @@ -982,6 +1111,8 @@
982 1111 <array>false</array>
983 1112 <array_dimension>null</array_dimension>
984 1113 <unsigned>false</unsigned>
  1114 + <zerofill>false</zerofill>
  1115 + <binary>false</binary>
985 1116 <args></args>
986 1117 <description>Código SRID correspondente à projeção cartográfica da coluna com a geometria</description>
987 1118 <logical_name>srid</logical_name>
... ... @@ -995,6 +1126,8 @@
995 1126 <array>false</array>
996 1127 <array_dimension>null</array_dimension>
997 1128 <unsigned>false</unsigned>
  1129 + <zerofill>false</zerofill>
  1130 + <binary>false</binary>
998 1131 <args></args>
999 1132 <description>Tabela no banco de dados que contém a coluna</description>
1000 1133 <logical_name>tabela</logical_name>
... ... @@ -1008,6 +1141,8 @@
1008 1141 <array>false</array>
1009 1142 <array_dimension>null</array_dimension>
1010 1143 <unsigned>false</unsigned>
  1144 + <zerofill>false</zerofill>
  1145 + <binary>false</binary>
1011 1146 <args></args>
1012 1147 <description>Tabela que contém a coluna com a geometria</description>
1013 1148 <logical_name>tabela</logical_name>
... ... @@ -1021,6 +1156,8 @@
1021 1156 <array>false</array>
1022 1157 <array_dimension>null</array_dimension>
1023 1158 <unsigned>false</unsigned>
  1159 + <zerofill>false</zerofill>
  1160 + <binary>false</binary>
1024 1161 <args></args>
1025 1162 <description>Tamanho do símbolo (item size do mapfile)</description>
1026 1163 <logical_name>tamanho</logical_name>
... ... @@ -1034,6 +1171,8 @@
1034 1171 <array>false</array>
1035 1172 <array_dimension>null</array_dimension>
1036 1173 <unsigned>false</unsigned>
  1174 + <zerofill>false</zerofill>
  1175 + <binary>false</binary>
1037 1176 <args></args>
1038 1177 <description>Nome do template para compor a interface</description>
1039 1178 <logical_name>template</logical_name>
... ... @@ -1047,6 +1186,8 @@
1047 1186 <array>false</array>
1048 1187 <array_dimension>null</array_dimension>
1049 1188 <unsigned>false</unsigned>
  1189 + <zerofill>false</zerofill>
  1190 + <binary>false</binary>
1050 1191 <args></args>
1051 1192 <description>Tipo de parâmetro, podendo ser:&#x0A;0 - Não definido&#x0A;1 - Ano&#x0A;2 - Mês&#x0A;3 - Dia&#x0A;4 - Hora&#x0A;5 - Lista de opção</description>
1052 1193 <logical_name>tipo</logical_name>
... ... @@ -1060,6 +1201,8 @@
1060 1201 <array>false</array>
1061 1202 <array_dimension>null</array_dimension>
1062 1203 <unsigned>false</unsigned>
  1204 + <zerofill>false</zerofill>
  1205 + <binary>false</binary>
1063 1206 <args></args>
1064 1207 <description></description>
1065 1208 <logical_name>titulo</logical_name>
... ... @@ -1073,6 +1216,8 @@
1073 1216 <array>false</array>
1074 1217 <array_dimension>null</array_dimension>
1075 1218 <unsigned>false</unsigned>
  1219 + <zerofill>false</zerofill>
  1220 + <binary>false</binary>
1076 1221 <args></args>
1077 1222 <description></description>
1078 1223 <logical_name>titulo</logical_name>
... ... @@ -1086,6 +1231,8 @@
1086 1231 <array>false</array>
1087 1232 <array_dimension>null</array_dimension>
1088 1233 <unsigned>false</unsigned>
  1234 + <zerofill>false</zerofill>
  1235 + <binary>false</binary>
1089 1236 <args></args>
1090 1237 <description>Titulo do tema, se for vazio, usa o definido no sistema metaestat</description>
1091 1238 <logical_name>titulo</logical_name>
... ... @@ -1099,6 +1246,8 @@
1099 1246 <array>false</array>
1100 1247 <array_dimension>null</array_dimension>
1101 1248 <unsigned>false</unsigned>
  1249 + <zerofill>false</zerofill>
  1250 + <binary>false</binary>
1102 1251 <args></args>
1103 1252 <description>Título completo da fonte, devendo conter o ano quando for o caso</description>
1104 1253 <logical_name>titulo</logical_name>
... ... @@ -1112,6 +1261,8 @@
1112 1261 <array>false</array>
1113 1262 <array_dimension>null</array_dimension>
1114 1263 <unsigned>false</unsigned>
  1264 + <zerofill>false</zerofill>
  1265 + <binary>false</binary>
1115 1266 <args></args>
1116 1267 <description>Título da classe</description>
1117 1268 <logical_name>titulo</logical_name>
... ... @@ -1125,6 +1276,8 @@
1125 1276 <array>false</array>
1126 1277 <array_dimension>null</array_dimension>
1127 1278 <unsigned>false</unsigned>
  1279 + <zerofill>false</zerofill>
  1280 + <binary>false</binary>
1128 1281 <args></args>
1129 1282 <description>Nome do usuário que pode acessar o banco</description>
1130 1283 <logical_name>usuario</logical_name>
... ... @@ -1138,6 +1291,8 @@
1138 1291 <array>false</array>
1139 1292 <array_dimension>null</array_dimension>
1140 1293 <unsigned>false</unsigned>
  1294 + <zerofill>false</zerofill>
  1295 + <binary>false</binary>
1141 1296 <args></args>
1142 1297 <description>componente G da cor utilizada para representar a classe</description>
1143 1298 <logical_name>verde</logical_name>
... ... @@ -1151,6 +1306,8 @@
1151 1306 <array>false</array>
1152 1307 <array_dimension>null</array_dimension>
1153 1308 <unsigned>false</unsigned>
  1309 + <zerofill>false</zerofill>
  1310 + <binary>false</binary>
1154 1311 <args></args>
1155 1312 <description>componente R da cor utilizada para representar a classe</description>
1156 1313 <logical_name>vermelho</logical_name>
... ... @@ -1242,6 +1399,7 @@
1242 1399 <max_value></max_value>
1243 1400 <start></start>
1244 1401 <cache></cache>
  1402 + <nocache>false</nocache>
1245 1403 <cycle>false</cycle>
1246 1404 <order>false</order>
1247 1405 <description></description>
... ... @@ -1250,7 +1408,7 @@
1250 1408 </sequence>
1251 1409 </normal_column>
1252 1410 <normal_column>
1253   - <word_id>49</word_id>
  1411 + <word_id>48</word_id>
1254 1412 <id>1</id>
1255 1413 <description></description>
1256 1414 <unique_key_name></unique_key_name>
... ... @@ -1274,6 +1432,7 @@
1274 1432 <max_value></max_value>
1275 1433 <start></start>
1276 1434 <cache></cache>
  1435 + <nocache>false</nocache>
1277 1436 <cycle>false</cycle>
1278 1437 <order>false</order>
1279 1438 <description></description>
... ... @@ -1306,6 +1465,7 @@
1306 1465 <max_value></max_value>
1307 1466 <start></start>
1308 1467 <cache></cache>
  1468 + <nocache>false</nocache>
1309 1469 <cycle>false</cycle>
1310 1470 <order>false</order>
1311 1471 <description></description>
... ... @@ -1338,6 +1498,7 @@
1338 1498 <max_value></max_value>
1339 1499 <start></start>
1340 1500 <cache></cache>
  1501 + <nocache>false</nocache>
1341 1502 <cycle>false</cycle>
1342 1503 <order>false</order>
1343 1504 <description></description>
... ... @@ -1370,6 +1531,7 @@
1370 1531 <max_value></max_value>
1371 1532 <start></start>
1372 1533 <cache></cache>
  1534 + <nocache>false</nocache>
1373 1535 <cycle>false</cycle>
1374 1536 <order>false</order>
1375 1537 <description></description>
... ... @@ -1433,6 +1595,7 @@
1433 1595 <max_value></max_value>
1434 1596 <start></start>
1435 1597 <cache></cache>
  1598 + <nocache>false</nocache>
1436 1599 <cycle>false</cycle>
1437 1600 <order>false</order>
1438 1601 <description></description>
... ... @@ -1441,7 +1604,7 @@
1441 1604 </sequence>
1442 1605 </normal_column>
1443 1606 <normal_column>
1444   - <word_id>45</word_id>
  1607 + <word_id>49</word_id>
1445 1608 <id>6</id>
1446 1609 <description></description>
1447 1610 <unique_key_name></unique_key_name>
... ... @@ -1465,6 +1628,7 @@
1465 1628 <max_value></max_value>
1466 1629 <start></start>
1467 1630 <cache></cache>
  1631 + <nocache>false</nocache>
1468 1632 <cycle>false</cycle>
1469 1633 <order>false</order>
1470 1634 <description></description>
... ... @@ -1497,6 +1661,7 @@
1497 1661 <max_value></max_value>
1498 1662 <start></start>
1499 1663 <cache></cache>
  1664 + <nocache>false</nocache>
1500 1665 <cycle>false</cycle>
1501 1666 <order>false</order>
1502 1667 <description></description>
... ... @@ -1560,6 +1725,7 @@
1560 1725 <max_value></max_value>
1561 1726 <start></start>
1562 1727 <cache></cache>
  1728 + <nocache>false</nocache>
1563 1729 <cycle>false</cycle>
1564 1730 <order>false</order>
1565 1731 <description></description>
... ... @@ -1568,7 +1734,7 @@
1568 1734 </sequence>
1569 1735 </normal_column>
1570 1736 <normal_column>
1571   - <word_id>47</word_id>
  1737 + <word_id>45</word_id>
1572 1738 <id>9</id>
1573 1739 <description></description>
1574 1740 <unique_key_name></unique_key_name>
... ... @@ -1592,6 +1758,7 @@
1592 1758 <max_value></max_value>
1593 1759 <start></start>
1594 1760 <cache></cache>
  1761 + <nocache>false</nocache>
1595 1762 <cycle>false</cycle>
1596 1763 <order>false</order>
1597 1764 <description></description>
... ... @@ -1624,6 +1791,7 @@
1624 1791 <max_value></max_value>
1625 1792 <start></start>
1626 1793 <cache></cache>
  1794 + <nocache>false</nocache>
1627 1795 <cycle>false</cycle>
1628 1796 <order>false</order>
1629 1797 <description></description>
... ... @@ -1658,16 +1826,21 @@
1658 1826 <id>0</id>
1659 1827 <source>9</source>
1660 1828 <target>5</target>
  1829 + <source_xp>-1</source_xp>
  1830 + <source_yp>-1</source_yp>
  1831 + <target_xp>-1</target_xp>
  1832 + <target_yp>-1</target_yp>
  1833 + <color>
  1834 + <r>0</r>
  1835 + <g>0</g>
  1836 + <b>0</b>
  1837 + </color>
1661 1838 <child_cardinality>1..n</child_cardinality>
1662 1839 <parent_cardinality>1</parent_cardinality>
1663 1840 <reference_for_pk>true</reference_for_pk>
1664 1841 <name></name>
1665 1842 <on_delete_action>RESTRICT</on_delete_action>
1666 1843 <on_update_action>RESTRICT</on_update_action>
1667   - <source_xp>-1</source_xp>
1668   - <source_yp>-1</source_yp>
1669   - <target_xp>-1</target_xp>
1670   - <target_yp>-1</target_yp>
1671 1844 <referenced_column>null</referenced_column>
1672 1845 <referenced_complex_unique_key>null</referenced_complex_unique_key>
1673 1846 </relation>
... ... @@ -1704,6 +1877,7 @@
1704 1877 <max_value></max_value>
1705 1878 <start></start>
1706 1879 <cache></cache>
  1880 + <nocache>false</nocache>
1707 1881 <cycle>false</cycle>
1708 1882 <order>false</order>
1709 1883 <description></description>
... ... @@ -1712,7 +1886,7 @@
1712 1886 </sequence>
1713 1887 </normal_column>
1714 1888 <normal_column>
1715   - <word_id>48</word_id>
  1889 + <word_id>44</word_id>
1716 1890 <id>12</id>
1717 1891 <description></description>
1718 1892 <unique_key_name></unique_key_name>
... ... @@ -1736,6 +1910,7 @@
1736 1910 <max_value></max_value>
1737 1911 <start></start>
1738 1912 <cache></cache>
  1913 + <nocache>false</nocache>
1739 1914 <cycle>false</cycle>
1740 1915 <order>false</order>
1741 1916 <description></description>
... ... @@ -1769,6 +1944,7 @@
1769 1944 <max_value></max_value>
1770 1945 <start></start>
1771 1946 <cache></cache>
  1947 + <nocache>false</nocache>
1772 1948 <cycle>false</cycle>
1773 1949 <order>false</order>
1774 1950 <description></description>
... ... @@ -1801,6 +1977,7 @@
1801 1977 <max_value></max_value>
1802 1978 <start></start>
1803 1979 <cache></cache>
  1980 + <nocache>false</nocache>
1804 1981 <cycle>false</cycle>
1805 1982 <order>false</order>
1806 1983 <description></description>
... ... @@ -1835,16 +2012,21 @@
1835 2012 <id>1</id>
1836 2013 <source>5</source>
1837 2014 <target>6</target>
  2015 + <source_xp>-1</source_xp>
  2016 + <source_yp>-1</source_yp>
  2017 + <target_xp>-1</target_xp>
  2018 + <target_yp>-1</target_yp>
  2019 + <color>
  2020 + <r>0</r>
  2021 + <g>0</g>
  2022 + <b>0</b>
  2023 + </color>
1838 2024 <child_cardinality>1..n</child_cardinality>
1839 2025 <parent_cardinality>1</parent_cardinality>
1840 2026 <reference_for_pk>true</reference_for_pk>
1841 2027 <name></name>
1842 2028 <on_delete_action>RESTRICT</on_delete_action>
1843 2029 <on_update_action>RESTRICT</on_update_action>
1844   - <source_xp>-1</source_xp>
1845   - <source_yp>-1</source_yp>
1846   - <target_xp>-1</target_xp>
1847   - <target_yp>-1</target_yp>
1848 2030 <referenced_column>null</referenced_column>
1849 2031 <referenced_complex_unique_key>null</referenced_complex_unique_key>
1850 2032 </relation>
... ... @@ -1881,6 +2063,7 @@
1881 2063 <max_value></max_value>
1882 2064 <start></start>
1883 2065 <cache></cache>
  2066 + <nocache>false</nocache>
1884 2067 <cycle>false</cycle>
1885 2068 <order>false</order>
1886 2069 <description></description>
... ... @@ -1913,6 +2096,7 @@
1913 2096 <max_value></max_value>
1914 2097 <start></start>
1915 2098 <cache></cache>
  2099 + <nocache>false</nocache>
1916 2100 <cycle>false</cycle>
1917 2101 <order>false</order>
1918 2102 <description></description>
... ... @@ -1945,6 +2129,7 @@
1945 2129 <max_value></max_value>
1946 2130 <start></start>
1947 2131 <cache></cache>
  2132 + <nocache>false</nocache>
1948 2133 <cycle>false</cycle>
1949 2134 <order>false</order>
1950 2135 <description></description>
... ... @@ -1977,6 +2162,7 @@
1977 2162 <max_value></max_value>
1978 2163 <start></start>
1979 2164 <cache></cache>
  2165 + <nocache>false</nocache>
1980 2166 <cycle>false</cycle>
1981 2167 <order>false</order>
1982 2168 <description></description>
... ... @@ -2009,6 +2195,7 @@
2009 2195 <max_value></max_value>
2010 2196 <start></start>
2011 2197 <cache></cache>
  2198 + <nocache>false</nocache>
2012 2199 <cycle>false</cycle>
2013 2200 <order>false</order>
2014 2201 <description></description>
... ... @@ -2041,6 +2228,7 @@
2041 2228 <max_value></max_value>
2042 2229 <start></start>
2043 2230 <cache></cache>
  2231 + <nocache>false</nocache>
2044 2232 <cycle>false</cycle>
2045 2233 <order>false</order>
2046 2234 <description></description>
... ... @@ -2074,6 +2262,7 @@
2074 2262 <max_value></max_value>
2075 2263 <start></start>
2076 2264 <cache></cache>
  2265 + <nocache>false</nocache>
2077 2266 <cycle>false</cycle>
2078 2267 <order>false</order>
2079 2268 <description></description>
... ... @@ -2106,6 +2295,7 @@
2106 2295 <max_value></max_value>
2107 2296 <start></start>
2108 2297 <cache></cache>
  2298 + <nocache>false</nocache>
2109 2299 <cycle>false</cycle>
2110 2300 <order>false</order>
2111 2301 <description></description>
... ... @@ -2138,6 +2328,7 @@
2138 2328 <max_value></max_value>
2139 2329 <start></start>
2140 2330 <cache></cache>
  2331 + <nocache>false</nocache>
2141 2332 <cycle>false</cycle>
2142 2333 <order>false</order>
2143 2334 <description></description>
... ... @@ -2170,6 +2361,7 @@
2170 2361 <max_value></max_value>
2171 2362 <start></start>
2172 2363 <cache></cache>
  2364 + <nocache>false</nocache>
2173 2365 <cycle>false</cycle>
2174 2366 <order>false</order>
2175 2367 <description></description>
... ... @@ -2202,6 +2394,7 @@
2202 2394 <max_value></max_value>
2203 2395 <start></start>
2204 2396 <cache></cache>
  2397 + <nocache>false</nocache>
2205 2398 <cycle>false</cycle>
2206 2399 <order>false</order>
2207 2400 <description></description>
... ... @@ -2234,6 +2427,7 @@
2234 2427 <max_value></max_value>
2235 2428 <start></start>
2236 2429 <cache></cache>
  2430 + <nocache>false</nocache>
2237 2431 <cycle>false</cycle>
2238 2432 <order>false</order>
2239 2433 <description></description>
... ... @@ -2266,6 +2460,7 @@
2266 2460 <max_value></max_value>
2267 2461 <start></start>
2268 2462 <cache></cache>
  2463 + <nocache>false</nocache>
2269 2464 <cycle>false</cycle>
2270 2465 <order>false</order>
2271 2466 <description></description>
... ... @@ -2329,6 +2524,7 @@
2329 2524 <max_value></max_value>
2330 2525 <start></start>
2331 2526 <cache></cache>
  2527 + <nocache>false</nocache>
2332 2528 <cycle>false</cycle>
2333 2529 <order>false</order>
2334 2530 <description></description>
... ... @@ -2361,6 +2557,7 @@
2361 2557 <max_value></max_value>
2362 2558 <start></start>
2363 2559 <cache></cache>
  2560 + <nocache>false</nocache>
2364 2561 <cycle>false</cycle>
2365 2562 <order>false</order>
2366 2563 <description></description>
... ... @@ -2369,7 +2566,7 @@
2369 2566 </sequence>
2370 2567 </normal_column>
2371 2568 <normal_column>
2372   - <word_id>41</word_id>
  2569 + <word_id>40</word_id>
2373 2570 <id>30</id>
2374 2571 <description></description>
2375 2572 <unique_key_name></unique_key_name>
... ... @@ -2393,6 +2590,7 @@
2393 2590 <max_value></max_value>
2394 2591 <start></start>
2395 2592 <cache></cache>
  2593 + <nocache>false</nocache>
2396 2594 <cycle>false</cycle>
2397 2595 <order>false</order>
2398 2596 <description></description>
... ... @@ -2427,16 +2625,21 @@
2427 2625 <id>2</id>
2428 2626 <source>7</source>
2429 2627 <target>8</target>
  2628 + <source_xp>-1</source_xp>
  2629 + <source_yp>-1</source_yp>
  2630 + <target_xp>-1</target_xp>
  2631 + <target_yp>-1</target_yp>
  2632 + <color>
  2633 + <r>0</r>
  2634 + <g>0</g>
  2635 + <b>0</b>
  2636 + </color>
2430 2637 <child_cardinality>1..n</child_cardinality>
2431 2638 <parent_cardinality>1</parent_cardinality>
2432 2639 <reference_for_pk>true</reference_for_pk>
2433 2640 <name></name>
2434 2641 <on_delete_action>RESTRICT</on_delete_action>
2435 2642 <on_update_action>RESTRICT</on_update_action>
2436   - <source_xp>-1</source_xp>
2437   - <source_yp>-1</source_yp>
2438   - <target_xp>-1</target_xp>
2439   - <target_yp>-1</target_yp>
2440 2643 <referenced_column>null</referenced_column>
2441 2644 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2442 2645 </relation>
... ... @@ -2444,16 +2647,21 @@
2444 2647 <id>3</id>
2445 2648 <source>9</source>
2446 2649 <target>8</target>
  2650 + <source_xp>-1</source_xp>
  2651 + <source_yp>-1</source_yp>
  2652 + <target_xp>-1</target_xp>
  2653 + <target_yp>-1</target_yp>
  2654 + <color>
  2655 + <r>0</r>
  2656 + <g>0</g>
  2657 + <b>0</b>
  2658 + </color>
2447 2659 <child_cardinality>1..n</child_cardinality>
2448 2660 <parent_cardinality>1</parent_cardinality>
2449 2661 <reference_for_pk>true</reference_for_pk>
2450 2662 <name></name>
2451 2663 <on_delete_action>RESTRICT</on_delete_action>
2452 2664 <on_update_action>RESTRICT</on_update_action>
2453   - <source_xp>-1</source_xp>
2454   - <source_yp>-1</source_yp>
2455   - <target_xp>-1</target_xp>
2456   - <target_yp>-1</target_yp>
2457 2665 <referenced_column>null</referenced_column>
2458 2666 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2459 2667 </relation>
... ... @@ -2491,6 +2699,7 @@
2491 2699 <max_value></max_value>
2492 2700 <start></start>
2493 2701 <cache></cache>
  2702 + <nocache>false</nocache>
2494 2703 <cycle>false</cycle>
2495 2704 <order>false</order>
2496 2705 <description></description>
... ... @@ -2524,6 +2733,7 @@
2524 2733 <max_value></max_value>
2525 2734 <start></start>
2526 2735 <cache></cache>
  2736 + <nocache>false</nocache>
2527 2737 <cycle>false</cycle>
2528 2738 <order>false</order>
2529 2739 <description></description>
... ... @@ -2556,86 +2766,111 @@
2556 2766 <connections>
2557 2767 <relation>
2558 2768 <id>4</id>
2559   - <source>12</source>
  2769 + <source>4</source>
2560 2770 <target>9</target>
  2771 + <source_xp>-1</source_xp>
  2772 + <source_yp>-1</source_yp>
  2773 + <target_xp>-1</target_xp>
  2774 + <target_yp>-1</target_yp>
  2775 + <color>
  2776 + <r>0</r>
  2777 + <g>0</g>
  2778 + <b>0</b>
  2779 + </color>
2561 2780 <child_cardinality>1..n</child_cardinality>
2562 2781 <parent_cardinality>1</parent_cardinality>
2563 2782 <reference_for_pk>true</reference_for_pk>
2564 2783 <name></name>
2565 2784 <on_delete_action>RESTRICT</on_delete_action>
2566 2785 <on_update_action>RESTRICT</on_update_action>
2567   - <source_xp>-1</source_xp>
2568   - <source_yp>-1</source_yp>
2569   - <target_xp>-1</target_xp>
2570   - <target_yp>-1</target_yp>
2571 2786 <referenced_column>null</referenced_column>
2572 2787 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2573 2788 </relation>
2574 2789 <relation>
2575 2790 <id>5</id>
2576   - <source>11</source>
  2791 + <source>3</source>
2577 2792 <target>9</target>
  2793 + <source_xp>-1</source_xp>
  2794 + <source_yp>-1</source_yp>
  2795 + <target_xp>-1</target_xp>
  2796 + <target_yp>-1</target_yp>
  2797 + <color>
  2798 + <r>0</r>
  2799 + <g>0</g>
  2800 + <b>0</b>
  2801 + </color>
2578 2802 <child_cardinality>1..n</child_cardinality>
2579 2803 <parent_cardinality>1</parent_cardinality>
2580 2804 <reference_for_pk>true</reference_for_pk>
2581 2805 <name></name>
2582 2806 <on_delete_action>RESTRICT</on_delete_action>
2583 2807 <on_update_action>RESTRICT</on_update_action>
2584   - <source_xp>-1</source_xp>
2585   - <source_yp>-1</source_yp>
2586   - <target_xp>-1</target_xp>
2587   - <target_yp>-1</target_yp>
2588 2808 <referenced_column>null</referenced_column>
2589 2809 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2590 2810 </relation>
2591 2811 <relation>
2592 2812 <id>6</id>
2593   - <source>4</source>
  2813 + <source>11</source>
2594 2814 <target>9</target>
  2815 + <source_xp>-1</source_xp>
  2816 + <source_yp>-1</source_yp>
  2817 + <target_xp>-1</target_xp>
  2818 + <target_yp>-1</target_yp>
  2819 + <color>
  2820 + <r>0</r>
  2821 + <g>0</g>
  2822 + <b>0</b>
  2823 + </color>
2595 2824 <child_cardinality>1..n</child_cardinality>
2596 2825 <parent_cardinality>1</parent_cardinality>
2597 2826 <reference_for_pk>true</reference_for_pk>
2598 2827 <name></name>
2599 2828 <on_delete_action>RESTRICT</on_delete_action>
2600 2829 <on_update_action>RESTRICT</on_update_action>
2601   - <source_xp>-1</source_xp>
2602   - <source_yp>-1</source_yp>
2603   - <target_xp>-1</target_xp>
2604   - <target_yp>-1</target_yp>
2605 2830 <referenced_column>null</referenced_column>
2606 2831 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2607 2832 </relation>
2608 2833 <relation>
2609 2834 <id>7</id>
2610   - <source>3</source>
  2835 + <source>2</source>
2611 2836 <target>9</target>
  2837 + <source_xp>-1</source_xp>
  2838 + <source_yp>-1</source_yp>
  2839 + <target_xp>-1</target_xp>
  2840 + <target_yp>-1</target_yp>
  2841 + <color>
  2842 + <r>0</r>
  2843 + <g>0</g>
  2844 + <b>0</b>
  2845 + </color>
2612 2846 <child_cardinality>1..n</child_cardinality>
2613 2847 <parent_cardinality>1</parent_cardinality>
2614 2848 <reference_for_pk>true</reference_for_pk>
2615 2849 <name></name>
2616 2850 <on_delete_action>RESTRICT</on_delete_action>
2617 2851 <on_update_action>RESTRICT</on_update_action>
2618   - <source_xp>-1</source_xp>
2619   - <source_yp>-1</source_yp>
2620   - <target_xp>-1</target_xp>
2621   - <target_yp>-1</target_yp>
2622 2852 <referenced_column>null</referenced_column>
2623 2853 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2624 2854 </relation>
2625 2855 <relation>
2626 2856 <id>8</id>
2627   - <source>2</source>
  2857 + <source>17</source>
2628 2858 <target>9</target>
  2859 + <source_xp>-1</source_xp>
  2860 + <source_yp>-1</source_yp>
  2861 + <target_xp>-1</target_xp>
  2862 + <target_yp>-1</target_yp>
  2863 + <color>
  2864 + <r>0</r>
  2865 + <g>0</g>
  2866 + <b>0</b>
  2867 + </color>
2629 2868 <child_cardinality>1..n</child_cardinality>
2630 2869 <parent_cardinality>1</parent_cardinality>
2631 2870 <reference_for_pk>true</reference_for_pk>
2632 2871 <name></name>
2633 2872 <on_delete_action>RESTRICT</on_delete_action>
2634 2873 <on_update_action>RESTRICT</on_update_action>
2635   - <source_xp>-1</source_xp>
2636   - <source_yp>-1</source_yp>
2637   - <target_xp>-1</target_xp>
2638   - <target_yp>-1</target_yp>
2639 2874 <referenced_column>null</referenced_column>
2640 2875 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2641 2876 </relation>
... ... @@ -2672,6 +2907,7 @@
2672 2907 <max_value></max_value>
2673 2908 <start></start>
2674 2909 <cache></cache>
  2910 + <nocache>false</nocache>
2675 2911 <cycle>false</cycle>
2676 2912 <order>false</order>
2677 2913 <description></description>
... ... @@ -2682,7 +2918,7 @@
2682 2918 <normal_column>
2683 2919 <id>34</id>
2684 2920 <referenced_column>0</referenced_column>
2685   - <relation>8</relation>
  2921 + <relation>7</relation>
2686 2922 <description></description>
2687 2923 <unique_key_name></unique_key_name>
2688 2924 <logical_name></logical_name>
... ... @@ -2705,6 +2941,7 @@
2705 2941 <max_value></max_value>
2706 2942 <start></start>
2707 2943 <cache></cache>
  2944 + <nocache>false</nocache>
2708 2945 <cycle>false</cycle>
2709 2946 <order>false</order>
2710 2947 <description></description>
... ... @@ -2715,7 +2952,7 @@
2715 2952 <normal_column>
2716 2953 <id>35</id>
2717 2954 <referenced_column>5</referenced_column>
2718   - <relation>7</relation>
  2955 + <relation>5</relation>
2719 2956 <description></description>
2720 2957 <unique_key_name></unique_key_name>
2721 2958 <logical_name></logical_name>
... ... @@ -2738,6 +2975,7 @@
2738 2975 <max_value></max_value>
2739 2976 <start></start>
2740 2977 <cache></cache>
  2978 + <nocache>false</nocache>
2741 2979 <cycle>false</cycle>
2742 2980 <order>false</order>
2743 2981 <description></description>
... ... @@ -2748,7 +2986,7 @@
2748 2986 <normal_column>
2749 2987 <id>36</id>
2750 2988 <referenced_column>8</referenced_column>
2751   - <relation>6</relation>
  2989 + <relation>4</relation>
2752 2990 <description></description>
2753 2991 <unique_key_name></unique_key_name>
2754 2992 <logical_name></logical_name>
... ... @@ -2771,6 +3009,7 @@
2771 3009 <max_value></max_value>
2772 3010 <start></start>
2773 3011 <cache></cache>
  3012 + <nocache>false</nocache>
2774 3013 <cycle>false</cycle>
2775 3014 <order>false</order>
2776 3015 <description></description>
... ... @@ -2780,8 +3019,8 @@
2780 3019 </normal_column>
2781 3020 <normal_column>
2782 3021 <id>37</id>
2783   - <referenced_column>56</referenced_column>
2784   - <relation>4</relation>
  3022 + <referenced_column>80</referenced_column>
  3023 + <relation>8</relation>
2785 3024 <description></description>
2786 3025 <unique_key_name></unique_key_name>
2787 3026 <logical_name></logical_name>
... ... @@ -2804,6 +3043,7 @@
2804 3043 <max_value></max_value>
2805 3044 <start></start>
2806 3045 <cache></cache>
  3046 + <nocache>false</nocache>
2807 3047 <cycle>false</cycle>
2808 3048 <order>false</order>
2809 3049 <description></description>
... ... @@ -2814,7 +3054,7 @@
2814 3054 <normal_column>
2815 3055 <id>38</id>
2816 3056 <referenced_column>50</referenced_column>
2817   - <relation>5</relation>
  3057 + <relation>6</relation>
2818 3058 <description></description>
2819 3059 <unique_key_name></unique_key_name>
2820 3060 <logical_name></logical_name>
... ... @@ -2837,6 +3077,7 @@
2837 3077 <max_value></max_value>
2838 3078 <start></start>
2839 3079 <cache></cache>
  3080 + <nocache>false</nocache>
2840 3081 <cycle>false</cycle>
2841 3082 <order>false</order>
2842 3083 <description></description>
... ... @@ -2869,6 +3110,7 @@
2869 3110 <max_value></max_value>
2870 3111 <start></start>
2871 3112 <cache></cache>
  3113 + <nocache>false</nocache>
2872 3114 <cycle>false</cycle>
2873 3115 <order>false</order>
2874 3116 <description></description>
... ... @@ -2901,6 +3143,7 @@
2901 3143 <max_value></max_value>
2902 3144 <start></start>
2903 3145 <cache></cache>
  3146 + <nocache>false</nocache>
2904 3147 <cycle>false</cycle>
2905 3148 <order>false</order>
2906 3149 <description></description>
... ... @@ -2933,6 +3176,7 @@
2933 3176 <max_value></max_value>
2934 3177 <start></start>
2935 3178 <cache></cache>
  3179 + <nocache>false</nocache>
2936 3180 <cycle>false</cycle>
2937 3181 <order>false</order>
2938 3182 <description></description>
... ... @@ -2965,6 +3209,7 @@
2965 3209 <max_value></max_value>
2966 3210 <start></start>
2967 3211 <cache></cache>
  3212 + <nocache>false</nocache>
2968 3213 <cycle>false</cycle>
2969 3214 <order>false</order>
2970 3215 <description></description>
... ... @@ -2997,6 +3242,7 @@
2997 3242 <max_value></max_value>
2998 3243 <start></start>
2999 3244 <cache></cache>
  3245 + <nocache>false</nocache>
3000 3246 <cycle>false</cycle>
3001 3247 <order>false</order>
3002 3248 <description></description>
... ... @@ -3029,6 +3275,7 @@
3029 3275 <max_value></max_value>
3030 3276 <start></start>
3031 3277 <cache></cache>
  3278 + <nocache>false</nocache>
3032 3279 <cycle>false</cycle>
3033 3280 <order>false</order>
3034 3281 <description></description>
... ... @@ -3061,6 +3308,7 @@
3061 3308 <max_value></max_value>
3062 3309 <start></start>
3063 3310 <cache></cache>
  3311 + <nocache>false</nocache>
3064 3312 <cycle>false</cycle>
3065 3313 <order>false</order>
3066 3314 <description></description>
... ... @@ -3095,16 +3343,21 @@
3095 3343 <id>9</id>
3096 3344 <source>9</source>
3097 3345 <target>10</target>
  3346 + <source_xp>-1</source_xp>
  3347 + <source_yp>-1</source_yp>
  3348 + <target_xp>-1</target_xp>
  3349 + <target_yp>-1</target_yp>
  3350 + <color>
  3351 + <r>0</r>
  3352 + <g>0</g>
  3353 + <b>0</b>
  3354 + </color>
3098 3355 <child_cardinality>1..n</child_cardinality>
3099 3356 <parent_cardinality>1</parent_cardinality>
3100 3357 <reference_for_pk>true</reference_for_pk>
3101 3358 <name></name>
3102 3359 <on_delete_action>RESTRICT</on_delete_action>
3103 3360 <on_update_action>RESTRICT</on_update_action>
3104   - <source_xp>-1</source_xp>
3105   - <source_yp>-1</source_yp>
3106   - <target_xp>-1</target_xp>
3107   - <target_yp>-1</target_yp>
3108 3361 <referenced_column>null</referenced_column>
3109 3362 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3110 3363 </relation>
... ... @@ -3117,7 +3370,7 @@
3117 3370 <option></option>
3118 3371 <columns>
3119 3372 <normal_column>
3120   - <word_id>40</word_id>
  3373 + <word_id>41</word_id>
3121 3374 <id>46</id>
3122 3375 <description></description>
3123 3376 <unique_key_name></unique_key_name>
... ... @@ -3141,6 +3394,7 @@
3141 3394 <max_value></max_value>
3142 3395 <start></start>
3143 3396 <cache></cache>
  3397 + <nocache>false</nocache>
3144 3398 <cycle>false</cycle>
3145 3399 <order>false</order>
3146 3400 <description></description>
... ... @@ -3174,6 +3428,7 @@
3174 3428 <max_value></max_value>
3175 3429 <start></start>
3176 3430 <cache></cache>
  3431 + <nocache>false</nocache>
3177 3432 <cycle>false</cycle>
3178 3433 <order>false</order>
3179 3434 <description></description>
... ... @@ -3182,7 +3437,7 @@
3182 3437 </sequence>
3183 3438 </normal_column>
3184 3439 <normal_column>
3185   - <word_id>44</word_id>
  3440 + <word_id>46</word_id>
3186 3441 <id>48</id>
3187 3442 <description></description>
3188 3443 <unique_key_name></unique_key_name>
... ... @@ -3206,6 +3461,7 @@
3206 3461 <max_value></max_value>
3207 3462 <start></start>
3208 3463 <cache></cache>
  3464 + <nocache>false</nocache>
3209 3465 <cycle>false</cycle>
3210 3466 <order>false</order>
3211 3467 <description></description>
... ... @@ -3238,6 +3494,7 @@
3238 3494 <max_value></max_value>
3239 3495 <start></start>
3240 3496 <cache></cache>
  3497 + <nocache>false</nocache>
3241 3498 <cycle>false</cycle>
3242 3499 <order>false</order>
3243 3500 <description></description>
... ... @@ -3301,6 +3558,7 @@
3301 3558 <max_value></max_value>
3302 3559 <start></start>
3303 3560 <cache></cache>
  3561 + <nocache>false</nocache>
3304 3562 <cycle>false</cycle>
3305 3563 <order>false</order>
3306 3564 <description></description>
... ... @@ -3333,6 +3591,7 @@
3333 3591 <max_value></max_value>
3334 3592 <start></start>
3335 3593 <cache></cache>
  3594 + <nocache>false</nocache>
3336 3595 <cycle>false</cycle>
3337 3596 <order>false</order>
3338 3597 <description></description>
... ... @@ -3365,6 +3624,7 @@
3365 3624 <max_value></max_value>
3366 3625 <start></start>
3367 3626 <cache></cache>
  3627 + <nocache>false</nocache>
3368 3628 <cycle>false</cycle>
3369 3629 <order>false</order>
3370 3630 <description></description>
... ... @@ -3397,6 +3657,7 @@
3397 3657 <max_value></max_value>
3398 3658 <start></start>
3399 3659 <cache></cache>
  3660 + <nocache>false</nocache>
3400 3661 <cycle>false</cycle>
3401 3662 <order>false</order>
3402 3663 <description></description>
... ... @@ -3429,6 +3690,7 @@
3429 3690 <max_value></max_value>
3430 3691 <start></start>
3431 3692 <cache></cache>
  3693 + <nocache>false</nocache>
3432 3694 <cycle>false</cycle>
3433 3695 <order>false</order>
3434 3696 <description></description>
... ... @@ -3461,6 +3723,7 @@
3461 3723 <max_value></max_value>
3462 3724 <start></start>
3463 3725 <cache></cache>
  3726 + <nocache>false</nocache>
3464 3727 <cycle>false</cycle>
3465 3728 <order>false</order>
3466 3729 <description></description>
... ... @@ -3479,12 +3742,12 @@
3479 3742 </table>
3480 3743 <table>
3481 3744 <id>12</id>
3482   - <height>338</height>
3483   - <width>292</width>
  3745 + <height>128</height>
  3746 + <width>270</width>
3484 3747 <font_name>Ubuntu</font_name>
3485 3748 <font_size>9</font_size>
3486   - <x>-341</x>
3487   - <y>222</y>
  3749 + <x>-328</x>
  3750 + <y>603</y>
3488 3751 <color>
3489 3752 <r>255</r>
3490 3753 <g>128</g>
... ... @@ -3493,31 +3756,36 @@
3493 3756 <connections>
3494 3757 <relation>
3495 3758 <id>10</id>
3496   - <source>11</source>
  3759 + <source>17</source>
3497 3760 <target>12</target>
  3761 + <source_xp>-1</source_xp>
  3762 + <source_yp>-1</source_yp>
  3763 + <target_xp>-1</target_xp>
  3764 + <target_yp>-1</target_yp>
  3765 + <color>
  3766 + <r>0</r>
  3767 + <g>0</g>
  3768 + <b>0</b>
  3769 + </color>
3498 3770 <child_cardinality>1..n</child_cardinality>
3499 3771 <parent_cardinality>1</parent_cardinality>
3500 3772 <reference_for_pk>true</reference_for_pk>
3501 3773 <name></name>
3502 3774 <on_delete_action>RESTRICT</on_delete_action>
3503 3775 <on_update_action>RESTRICT</on_update_action>
3504   - <source_xp>-1</source_xp>
3505   - <source_yp>-1</source_yp>
3506   - <target_xp>-1</target_xp>
3507   - <target_yp>-1</target_yp>
3508 3776 <referenced_column>null</referenced_column>
3509 3777 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3510 3778 </relation>
3511 3779 </connections>
3512   - <physical_name>i3geoestat_tipo_regiao</physical_name>
3513   - <logical_name>i3geoestat_tipo_regiao</logical_name>
3514   - <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
  3780 + <physical_name>i3geoestat_agregaregiao</physical_name>
  3781 + <logical_name>i3geoestat_agregaregiao</logical_name>
  3782 + <description></description>
3515 3783 <constraint></constraint>
3516 3784 <primary_key_name></primary_key_name>
3517 3785 <option></option>
3518 3786 <columns>
3519 3787 <normal_column>
3520   - <word_id>5</word_id>
  3788 + <word_id>29</word_id>
3521 3789 <id>56</id>
3522 3790 <description></description>
3523 3791 <unique_key_name></unique_key_name>
... ... @@ -3541,6 +3809,7 @@
3541 3809 <max_value></max_value>
3542 3810 <start></start>
3543 3811 <cache></cache>
  3812 + <nocache>false</nocache>
3544 3813 <cycle>false</cycle>
3545 3814 <order>false</order>
3546 3815 <description></description>
... ... @@ -3549,17 +3818,18 @@
3549 3818 </sequence>
3550 3819 </normal_column>
3551 3820 <normal_column>
3552   - <word_id>51</word_id>
3553 3821 <id>57</id>
  3822 + <referenced_column>80</referenced_column>
  3823 + <relation>10</relation>
3554 3824 <description></description>
3555 3825 <unique_key_name></unique_key_name>
3556 3826 <logical_name></logical_name>
3557 3827 <physical_name></physical_name>
3558   - <type>text</type>
  3828 + <type>integer</type>
3559 3829 <constraint></constraint>
3560 3830 <default_value></default_value>
3561 3831 <auto_increment>false</auto_increment>
3562   - <foreign_key>false</foreign_key>
  3832 + <foreign_key>true</foreign_key>
3563 3833 <not_null>false</not_null>
3564 3834 <primary_key>false</primary_key>
3565 3835 <unique_key>false</unique_key>
... ... @@ -3573,6 +3843,7 @@
3573 3843 <max_value></max_value>
3574 3844 <start></start>
3575 3845 <cache></cache>
  3846 + <nocache>false</nocache>
3576 3847 <cycle>false</cycle>
3577 3848 <order>false</order>
3578 3849 <description></description>
... ... @@ -3581,13 +3852,13 @@
3581 3852 </sequence>
3582 3853 </normal_column>
3583 3854 <normal_column>
3584   - <word_id>22</word_id>
  3855 + <word_id>6</word_id>
3585 3856 <id>58</id>
3586 3857 <description></description>
3587 3858 <unique_key_name></unique_key_name>
3588 3859 <logical_name></logical_name>
3589 3860 <physical_name></physical_name>
3590   - <type>text</type>
  3861 + <type>integer</type>
3591 3862 <constraint></constraint>
3592 3863 <default_value></default_value>
3593 3864 <auto_increment>false</auto_increment>
... ... @@ -3605,6 +3876,7 @@
3605 3876 <max_value></max_value>
3606 3877 <start></start>
3607 3878 <cache></cache>
  3879 + <nocache>false</nocache>
3608 3880 <cycle>false</cycle>
3609 3881 <order>false</order>
3610 3882 <description></description>
... ... @@ -3613,18 +3885,17 @@
3613 3885 </sequence>
3614 3886 </normal_column>
3615 3887 <normal_column>
  3888 + <word_id>14</word_id>
3616 3889 <id>59</id>
3617   - <referenced_column>50</referenced_column>
3618   - <relation>10</relation>
3619 3890 <description></description>
3620 3891 <unique_key_name></unique_key_name>
3621 3892 <logical_name></logical_name>
3622 3893 <physical_name></physical_name>
3623   - <type>integer</type>
  3894 + <type>text</type>
3624 3895 <constraint></constraint>
3625 3896 <default_value></default_value>
3626 3897 <auto_increment>false</auto_increment>
3627   - <foreign_key>true</foreign_key>
  3898 + <foreign_key>false</foreign_key>
3628 3899 <not_null>false</not_null>
3629 3900 <primary_key>false</primary_key>
3630 3901 <unique_key>false</unique_key>
... ... @@ -3638,6 +3909,7 @@
3638 3909 <max_value></max_value>
3639 3910 <start></start>
3640 3911 <cache></cache>
  3912 + <nocache>false</nocache>
3641 3913 <cycle>false</cycle>
3642 3914 <order>false</order>
3643 3915 <description></description>
... ... @@ -3645,21 +3917,74 @@
3645 3917 <decimal_size>0</decimal_size>
3646 3918 </sequence>
3647 3919 </normal_column>
  3920 + </columns>
  3921 + <indexes>
  3922 + </indexes>
  3923 + <complex_unique_key_list>
  3924 + </complex_unique_key_list>
  3925 + <table_properties>
  3926 + <schema></schema>
  3927 + </table_properties>
  3928 + </table>
  3929 + <table>
  3930 + <id>13</id>
  3931 + <height>191</height>
  3932 + <width>292</width>
  3933 + <font_name>Ubuntu</font_name>
  3934 + <font_size>9</font_size>
  3935 + <x>254</x>
  3936 + <y>678</y>
  3937 + <color>
  3938 + <r>160</r>
  3939 + <g>32</g>
  3940 + <b>240</b>
  3941 + </color>
  3942 + <connections>
  3943 + <relation>
  3944 + <id>11</id>
  3945 + <source>9</source>
  3946 + <target>13</target>
  3947 + <source_xp>-1</source_xp>
  3948 + <source_yp>-1</source_yp>
  3949 + <target_xp>-1</target_xp>
  3950 + <target_yp>-1</target_yp>
  3951 + <color>
  3952 + <r>0</r>
  3953 + <g>0</g>
  3954 + <b>0</b>
  3955 + </color>
  3956 + <child_cardinality>1..n</child_cardinality>
  3957 + <parent_cardinality>1</parent_cardinality>
  3958 + <reference_for_pk>true</reference_for_pk>
  3959 + <name></name>
  3960 + <on_delete_action>RESTRICT</on_delete_action>
  3961 + <on_update_action>RESTRICT</on_update_action>
  3962 + <referenced_column>null</referenced_column>
  3963 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3964 + </relation>
  3965 + </connections>
  3966 + <physical_name>i3geoestat_parametro_medida</physical_name>
  3967 + <logical_name>i3geoestat_parametro_medida</logical_name>
  3968 + <description></description>
  3969 + <constraint></constraint>
  3970 + <primary_key_name></primary_key_name>
  3971 + <option></option>
  3972 + <columns>
3648 3973 <normal_column>
3649   - <word_id>24</word_id>
  3974 + <word_id>39</word_id>
3650 3975 <id>60</id>
3651 3976 <description></description>
3652 3977 <unique_key_name></unique_key_name>
3653 3978 <logical_name></logical_name>
3654 3979 <physical_name></physical_name>
3655   - <type>text</type>
  3980 + <type>integer</type>
3656 3981 <constraint></constraint>
3657 3982 <default_value></default_value>
3658   - <auto_increment>false</auto_increment>
  3983 + <auto_increment>true</auto_increment>
3659 3984 <foreign_key>false</foreign_key>
3660   - <not_null>false</not_null>
3661   - <primary_key>false</primary_key>
3662   - <unique_key>false</unique_key>
  3985 + <not_null>true</not_null>
  3986 + <primary_key>true</primary_key>
  3987 + <unique_key>true</unique_key>
3663 3988 <character_set></character_set>
3664 3989 <collation></collation>
3665 3990 <sequence>
... ... @@ -3670,6 +3995,7 @@
3670 3995 <max_value></max_value>
3671 3996 <start></start>
3672 3997 <cache></cache>
  3998 + <nocache>false</nocache>
3673 3999 <cycle>false</cycle>
3674 4000 <order>false</order>
3675 4001 <description></description>
... ... @@ -3678,7 +4004,7 @@
3678 4004 </sequence>
3679 4005 </normal_column>
3680 4006 <normal_column>
3681   - <word_id>66</word_id>
  4007 + <word_id>9</word_id>
3682 4008 <id>61</id>
3683 4009 <description></description>
3684 4010 <unique_key_name></unique_key_name>
... ... @@ -3702,6 +4028,7 @@
3702 4028 <max_value></max_value>
3703 4029 <start></start>
3704 4030 <cache></cache>
  4031 + <nocache>false</nocache>
3705 4032 <cycle>false</cycle>
3706 4033 <order>false</order>
3707 4034 <description></description>
... ... @@ -3710,7 +4037,7 @@
3710 4037 </sequence>
3711 4038 </normal_column>
3712 4039 <normal_column>
3713   - <word_id>11</word_id>
  4040 + <word_id>47</word_id>
3714 4041 <id>62</id>
3715 4042 <description></description>
3716 4043 <unique_key_name></unique_key_name>
... ... @@ -3734,6 +4061,7 @@
3734 4061 <max_value></max_value>
3735 4062 <start></start>
3736 4063 <cache></cache>
  4064 + <nocache>false</nocache>
3737 4065 <cycle>false</cycle>
3738 4066 <order>false</order>
3739 4067 <description></description>
... ... @@ -3742,7 +4070,7 @@
3742 4070 </sequence>
3743 4071 </normal_column>
3744 4072 <normal_column>
3745   - <word_id>18</word_id>
  4073 + <word_id>20</word_id>
3746 4074 <id>63</id>
3747 4075 <description></description>
3748 4076 <unique_key_name></unique_key_name>
... ... @@ -3766,6 +4094,7 @@
3766 4094 <max_value></max_value>
3767 4095 <start></start>
3768 4096 <cache></cache>
  4097 + <nocache>false</nocache>
3769 4098 <cycle>false</cycle>
3770 4099 <order>false</order>
3771 4100 <description></description>
... ... @@ -3774,7 +4103,7 @@
3774 4103 </sequence>
3775 4104 </normal_column>
3776 4105 <normal_column>
3777   - <word_id>28</word_id>
  4106 + <word_id>38</word_id>
3778 4107 <id>64</id>
3779 4108 <description></description>
3780 4109 <unique_key_name></unique_key_name>
... ... @@ -3782,7 +4111,7 @@
3782 4111 <physical_name></physical_name>
3783 4112 <type>integer</type>
3784 4113 <constraint></constraint>
3785   - <default_value></default_value>
  4114 + <default_value>0</default_value>
3786 4115 <auto_increment>false</auto_increment>
3787 4116 <foreign_key>false</foreign_key>
3788 4117 <not_null>false</not_null>
... ... @@ -3798,6 +4127,7 @@
3798 4127 <max_value></max_value>
3799 4128 <start></start>
3800 4129 <cache></cache>
  4130 + <nocache>false</nocache>
3801 4131 <cycle>false</cycle>
3802 4132 <order>false</order>
3803 4133 <description></description>
... ... @@ -3806,17 +4136,18 @@
3806 4136 </sequence>
3807 4137 </normal_column>
3808 4138 <normal_column>
3809   - <word_id>15</word_id>
3810 4139 <id>65</id>
  4140 + <referenced_column>33</referenced_column>
  4141 + <relation>11</relation>
3811 4142 <description></description>
3812 4143 <unique_key_name></unique_key_name>
3813 4144 <logical_name></logical_name>
3814 4145 <physical_name></physical_name>
3815   - <type>text</type>
  4146 + <type>integer</type>
3816 4147 <constraint></constraint>
3817 4148 <default_value></default_value>
3818 4149 <auto_increment>false</auto_increment>
3819   - <foreign_key>false</foreign_key>
  4150 + <foreign_key>true</foreign_key>
3820 4151 <not_null>false</not_null>
3821 4152 <primary_key>false</primary_key>
3822 4153 <unique_key>false</unique_key>
... ... @@ -3830,6 +4161,7 @@
3830 4161 <max_value></max_value>
3831 4162 <start></start>
3832 4163 <cache></cache>
  4164 + <nocache>false</nocache>
3833 4165 <cycle>false</cycle>
3834 4166 <order>false</order>
3835 4167 <description></description>
... ... @@ -3838,15 +4170,15 @@
3838 4170 </sequence>
3839 4171 </normal_column>
3840 4172 <normal_column>
3841   - <word_id>64</word_id>
  4173 + <word_id>69</word_id>
3842 4174 <id>66</id>
3843 4175 <description></description>
3844 4176 <unique_key_name></unique_key_name>
3845 4177 <logical_name></logical_name>
3846 4178 <physical_name></physical_name>
3847   - <type>text</type>
  4179 + <type>integer</type>
3848 4180 <constraint></constraint>
3849   - <default_value>4326</default_value>
  4181 + <default_value>0</default_value>
3850 4182 <auto_increment>false</auto_increment>
3851 4183 <foreign_key>false</foreign_key>
3852 4184 <not_null>false</not_null>
... ... @@ -3862,6 +4194,7 @@
3862 4194 <max_value></max_value>
3863 4195 <start></start>
3864 4196 <cache></cache>
  4197 + <nocache>false</nocache>
3865 4198 <cycle>false</cycle>
3866 4199 <order>false</order>
3867 4200 <description></description>
... ... @@ -3869,21 +4202,52 @@
3869 4202 <decimal_size>0</decimal_size>
3870 4203 </sequence>
3871 4204 </normal_column>
  4205 + </columns>
  4206 + <indexes>
  4207 + </indexes>
  4208 + <complex_unique_key_list>
  4209 + </complex_unique_key_list>
  4210 + <table_properties>
  4211 + <schema></schema>
  4212 + </table_properties>
  4213 + </table>
  4214 + <table>
  4215 + <id>14</id>
  4216 + <height>170</height>
  4217 + <width>187</width>
  4218 + <font_name>Ubuntu</font_name>
  4219 + <font_size>9</font_size>
  4220 + <x>1063</x>
  4221 + <y>620</y>
  4222 + <color>
  4223 + <r>255</r>
  4224 + <g>128</g>
  4225 + <b>255</b>
  4226 + </color>
  4227 + <connections>
  4228 + </connections>
  4229 + <physical_name>i3geoestat_mapa</physical_name>
  4230 + <logical_name>i3geoestat_mapa</logical_name>
  4231 + <description></description>
  4232 + <constraint></constraint>
  4233 + <primary_key_name></primary_key_name>
  4234 + <option></option>
  4235 + <columns>
3872 4236 <normal_column>
3873   - <word_id>10</word_id>
  4237 + <word_id>34</word_id>
3874 4238 <id>67</id>
3875 4239 <description></description>
3876 4240 <unique_key_name></unique_key_name>
3877 4241 <logical_name></logical_name>
3878 4242 <physical_name></physical_name>
3879   - <type>text</type>
  4243 + <type>integer</type>
3880 4244 <constraint></constraint>
3881 4245 <default_value></default_value>
3882   - <auto_increment>false</auto_increment>
  4246 + <auto_increment>true</auto_increment>
3883 4247 <foreign_key>false</foreign_key>
3884   - <not_null>false</not_null>
3885   - <primary_key>false</primary_key>
3886   - <unique_key>false</unique_key>
  4248 + <not_null>true</not_null>
  4249 + <primary_key>true</primary_key>
  4250 + <unique_key>true</unique_key>
3887 4251 <character_set></character_set>
3888 4252 <collation></collation>
3889 4253 <sequence>
... ... @@ -3894,6 +4258,7 @@
3894 4258 <max_value></max_value>
3895 4259 <start></start>
3896 4260 <cache></cache>
  4261 + <nocache>false</nocache>
3897 4262 <cycle>false</cycle>
3898 4263 <order>false</order>
3899 4264 <description></description>
... ... @@ -3902,7 +4267,7 @@
3902 4267 </sequence>
3903 4268 </normal_column>
3904 4269 <normal_column>
3905   - <word_id>16</word_id>
  4270 + <word_id>70</word_id>
3906 4271 <id>68</id>
3907 4272 <description></description>
3908 4273 <unique_key_name></unique_key_name>
... ... @@ -3926,6 +4291,7 @@
3926 4291 <max_value></max_value>
3927 4292 <start></start>
3928 4293 <cache></cache>
  4294 + <nocache>false</nocache>
3929 4295 <cycle>false</cycle>
3930 4296 <order>false</order>
3931 4297 <description></description>
... ... @@ -3934,7 +4300,7 @@
3934 4300 </sequence>
3935 4301 </normal_column>
3936 4302 <normal_column>
3937   - <word_id>0</word_id>
  4303 + <word_id>68</word_id>
3938 4304 <id>69</id>
3939 4305 <description></description>
3940 4306 <unique_key_name></unique_key_name>
... ... @@ -3958,6 +4324,7 @@
3958 4324 <max_value></max_value>
3959 4325 <start></start>
3960 4326 <cache></cache>
  4327 + <nocache>false</nocache>
3961 4328 <cycle>false</cycle>
3962 4329 <order>false</order>
3963 4330 <description></description>
... ... @@ -3965,69 +4332,21 @@
3965 4332 <decimal_size>0</decimal_size>
3966 4333 </sequence>
3967 4334 </normal_column>
3968   - </columns>
3969   - <indexes>
3970   - </indexes>
3971   - <complex_unique_key_list>
3972   - </complex_unique_key_list>
3973   - <table_properties>
3974   - <schema></schema>
3975   - </table_properties>
3976   - </table>
3977   - <table>
3978   - <id>13</id>
3979   - <height>128</height>
3980   - <width>270</width>
3981   - <font_name>Ubuntu</font_name>
3982   - <font_size>9</font_size>
3983   - <x>-328</x>
3984   - <y>603</y>
3985   - <color>
3986   - <r>255</r>
3987   - <g>128</g>
3988   - <b>255</b>
3989   - </color>
3990   - <connections>
3991   - <relation>
3992   - <id>11</id>
3993   - <source>12</source>
3994   - <target>13</target>
3995   - <child_cardinality>1..n</child_cardinality>
3996   - <parent_cardinality>1</parent_cardinality>
3997   - <reference_for_pk>true</reference_for_pk>
3998   - <name></name>
3999   - <on_delete_action>RESTRICT</on_delete_action>
4000   - <on_update_action>RESTRICT</on_update_action>
4001   - <source_xp>-1</source_xp>
4002   - <source_yp>-1</source_yp>
4003   - <target_xp>-1</target_xp>
4004   - <target_yp>-1</target_yp>
4005   - <referenced_column>null</referenced_column>
4006   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
4007   - </relation>
4008   - </connections>
4009   - <physical_name>i3geoestat_agregaregiao</physical_name>
4010   - <logical_name>i3geoestat_agregaregiao</logical_name>
4011   - <description></description>
4012   - <constraint></constraint>
4013   - <primary_key_name></primary_key_name>
4014   - <option></option>
4015   - <columns>
4016 4335 <normal_column>
4017   - <word_id>29</word_id>
  4336 + <word_id>43</word_id>
4018 4337 <id>70</id>
4019 4338 <description></description>
4020 4339 <unique_key_name></unique_key_name>
4021 4340 <logical_name></logical_name>
4022 4341 <physical_name></physical_name>
4023   - <type>integer</type>
  4342 + <type>text</type>
4024 4343 <constraint></constraint>
4025 4344 <default_value></default_value>
4026   - <auto_increment>true</auto_increment>
  4345 + <auto_increment>false</auto_increment>
4027 4346 <foreign_key>false</foreign_key>
4028   - <not_null>true</not_null>
4029   - <primary_key>true</primary_key>
4030   - <unique_key>true</unique_key>
  4347 + <not_null>false</not_null>
  4348 + <primary_key>false</primary_key>
  4349 + <unique_key>false</unique_key>
4031 4350 <character_set></character_set>
4032 4351 <collation></collation>
4033 4352 <sequence>
... ... @@ -4038,6 +4357,7 @@
4038 4357 <max_value></max_value>
4039 4358 <start></start>
4040 4359 <cache></cache>
  4360 + <nocache>false</nocache>
4041 4361 <cycle>false</cycle>
4042 4362 <order>false</order>
4043 4363 <description></description>
... ... @@ -4046,18 +4366,17 @@
4046 4366 </sequence>
4047 4367 </normal_column>
4048 4368 <normal_column>
  4369 + <word_id>42</word_id>
4049 4370 <id>71</id>
4050   - <referenced_column>56</referenced_column>
4051   - <relation>11</relation>
4052 4371 <description></description>
4053 4372 <unique_key_name></unique_key_name>
4054 4373 <logical_name></logical_name>
4055 4374 <physical_name></physical_name>
4056   - <type>integer</type>
  4375 + <type>text</type>
4057 4376 <constraint></constraint>
4058 4377 <default_value></default_value>
4059 4378 <auto_increment>false</auto_increment>
4060   - <foreign_key>true</foreign_key>
  4379 + <foreign_key>false</foreign_key>
4061 4380 <not_null>false</not_null>
4062 4381 <primary_key>false</primary_key>
4063 4382 <unique_key>false</unique_key>
... ... @@ -4071,6 +4390,7 @@
4071 4390 <max_value></max_value>
4072 4391 <start></start>
4073 4392 <cache></cache>
  4393 + <nocache>false</nocache>
4074 4394 <cycle>false</cycle>
4075 4395 <order>false</order>
4076 4396 <description></description>
... ... @@ -4079,7 +4399,7 @@
4079 4399 </sequence>
4080 4400 </normal_column>
4081 4401 <normal_column>
4082   - <word_id>6</word_id>
  4402 + <word_id>60</word_id>
4083 4403 <id>72</id>
4084 4404 <description></description>
4085 4405 <unique_key_name></unique_key_name>
... ... @@ -4103,38 +4423,7 @@
4103 4423 <max_value></max_value>
4104 4424 <start></start>
4105 4425 <cache></cache>
4106   - <cycle>false</cycle>
4107   - <order>false</order>
4108   - <description></description>
4109   - <data_type></data_type>
4110   - <decimal_size>0</decimal_size>
4111   - </sequence>
4112   - </normal_column>
4113   - <normal_column>
4114   - <word_id>14</word_id>
4115   - <id>73</id>
4116   - <description></description>
4117   - <unique_key_name></unique_key_name>
4118   - <logical_name></logical_name>
4119   - <physical_name></physical_name>
4120   - <type>text</type>
4121   - <constraint></constraint>
4122   - <default_value></default_value>
4123   - <auto_increment>false</auto_increment>
4124   - <foreign_key>false</foreign_key>
4125   - <not_null>false</not_null>
4126   - <primary_key>false</primary_key>
4127   - <unique_key>false</unique_key>
4128   - <character_set></character_set>
4129   - <collation></collation>
4130   - <sequence>
4131   - <name></name>
4132   - <schema></schema>
4133   - <increment></increment>
4134   - <min_value></min_value>
4135   - <max_value></max_value>
4136   - <start></start>
4137   - <cache></cache>
  4426 + <nocache>false</nocache>
4138 4427 <cycle>false</cycle>
4139 4428 <order>false</order>
4140 4429 <description></description>
... ... @@ -4152,47 +4441,52 @@
4152 4441 </table_properties>
4153 4442 </table>
4154 4443 <table>
4155   - <id>14</id>
4156   - <height>191</height>
4157   - <width>292</width>
  4444 + <id>15</id>
  4445 + <height>107</height>
  4446 + <width>233</width>
4158 4447 <font_name>Ubuntu</font_name>
4159 4448 <font_size>9</font_size>
4160   - <x>254</x>
4161   - <y>678</y>
  4449 + <x>952</x>
  4450 + <y>858</y>
4162 4451 <color>
4163   - <r>160</r>
4164   - <g>32</g>
4165   - <b>240</b>
  4452 + <r>255</r>
  4453 + <g>128</g>
  4454 + <b>255</b>
4166 4455 </color>
4167 4456 <connections>
4168 4457 <relation>
4169 4458 <id>12</id>
4170   - <source>9</source>
4171   - <target>14</target>
  4459 + <source>14</source>
  4460 + <target>15</target>
  4461 + <source_xp>-1</source_xp>
  4462 + <source_yp>-1</source_yp>
  4463 + <target_xp>-1</target_xp>
  4464 + <target_yp>-1</target_yp>
  4465 + <color>
  4466 + <r>0</r>
  4467 + <g>0</g>
  4468 + <b>0</b>
  4469 + </color>
4172 4470 <child_cardinality>1..n</child_cardinality>
4173 4471 <parent_cardinality>1</parent_cardinality>
4174 4472 <reference_for_pk>true</reference_for_pk>
4175 4473 <name></name>
4176 4474 <on_delete_action>RESTRICT</on_delete_action>
4177 4475 <on_update_action>RESTRICT</on_update_action>
4178   - <source_xp>-1</source_xp>
4179   - <source_yp>-1</source_yp>
4180   - <target_xp>-1</target_xp>
4181   - <target_yp>-1</target_yp>
4182 4476 <referenced_column>null</referenced_column>
4183 4477 <referenced_complex_unique_key>null</referenced_complex_unique_key>
4184 4478 </relation>
4185 4479 </connections>
4186   - <physical_name>i3geoestat_parametro_medida</physical_name>
4187   - <logical_name>i3geoestat_parametro_medida</logical_name>
  4480 + <physical_name>i3geoestat_mapa_grupo</physical_name>
  4481 + <logical_name>i3geoestat_mapa_grupo</logical_name>
4188 4482 <description></description>
4189 4483 <constraint></constraint>
4190 4484 <primary_key_name></primary_key_name>
4191 4485 <option></option>
4192 4486 <columns>
4193 4487 <normal_column>
4194   - <word_id>39</word_id>
4195   - <id>74</id>
  4488 + <word_id>35</word_id>
  4489 + <id>73</id>
4196 4490 <description></description>
4197 4491 <unique_key_name></unique_key_name>
4198 4492 <logical_name></logical_name>
... ... @@ -4215,6 +4509,7 @@
4215 4509 <max_value></max_value>
4216 4510 <start></start>
4217 4511 <cache></cache>
  4512 + <nocache>false</nocache>
4218 4513 <cycle>false</cycle>
4219 4514 <order>false</order>
4220 4515 <description></description>
... ... @@ -4223,17 +4518,18 @@
4223 4518 </sequence>
4224 4519 </normal_column>
4225 4520 <normal_column>
4226   - <word_id>9</word_id>
4227   - <id>75</id>
  4521 + <id>74</id>
  4522 + <referenced_column>67</referenced_column>
  4523 + <relation>12</relation>
4228 4524 <description></description>
4229 4525 <unique_key_name></unique_key_name>
4230 4526 <logical_name></logical_name>
4231 4527 <physical_name></physical_name>
4232   - <type>text</type>
  4528 + <type>integer</type>
4233 4529 <constraint></constraint>
4234 4530 <default_value></default_value>
4235 4531 <auto_increment>false</auto_increment>
4236   - <foreign_key>false</foreign_key>
  4532 + <foreign_key>true</foreign_key>
4237 4533 <not_null>false</not_null>
4238 4534 <primary_key>false</primary_key>
4239 4535 <unique_key>false</unique_key>
... ... @@ -4247,6 +4543,7 @@
4247 4543 <max_value></max_value>
4248 4544 <start></start>
4249 4545 <cache></cache>
  4546 + <nocache>false</nocache>
4250 4547 <cycle>false</cycle>
4251 4548 <order>false</order>
4252 4549 <description></description>
... ... @@ -4255,8 +4552,8 @@
4255 4552 </sequence>
4256 4553 </normal_column>
4257 4554 <normal_column>
4258   - <word_id>46</word_id>
4259   - <id>76</id>
  4555 + <word_id>71</word_id>
  4556 + <id>75</id>
4260 4557 <description></description>
4261 4558 <unique_key_name></unique_key_name>
4262 4559 <logical_name></logical_name>
... ... @@ -4279,6 +4576,7 @@
4279 4576 <max_value></max_value>
4280 4577 <start></start>
4281 4578 <cache></cache>
  4579 + <nocache>false</nocache>
4282 4580 <cycle>false</cycle>
4283 4581 <order>false</order>
4284 4582 <description></description>
... ... @@ -4286,21 +4584,96 @@
4286 4584 <decimal_size>0</decimal_size>
4287 4585 </sequence>
4288 4586 </normal_column>
  4587 + </columns>
  4588 + <indexes>
  4589 + </indexes>
  4590 + <complex_unique_key_list>
  4591 + </complex_unique_key_list>
  4592 + <table_properties>
  4593 + <schema></schema>
  4594 + </table_properties>
  4595 + </table>
  4596 + <table>
  4597 + <id>16</id>
  4598 + <height>128</height>
  4599 + <width>269</width>
  4600 + <font_name>Ubuntu</font_name>
  4601 + <font_size>9</font_size>
  4602 + <x>604</x>
  4603 + <y>657</y>
  4604 + <color>
  4605 + <r>255</r>
  4606 + <g>128</g>
  4607 + <b>255</b>
  4608 + </color>
  4609 + <connections>
  4610 + <relation>
  4611 + <id>13</id>
  4612 + <source>15</source>
  4613 + <target>16</target>
  4614 + <source_xp>-1</source_xp>
  4615 + <source_yp>-1</source_yp>
  4616 + <target_xp>-1</target_xp>
  4617 + <target_yp>-1</target_yp>
  4618 + <color>
  4619 + <r>0</r>
  4620 + <g>0</g>
  4621 + <b>0</b>
  4622 + </color>
  4623 + <child_cardinality>1..n</child_cardinality>
  4624 + <parent_cardinality>1</parent_cardinality>
  4625 + <reference_for_pk>true</reference_for_pk>
  4626 + <name></name>
  4627 + <on_delete_action>RESTRICT</on_delete_action>
  4628 + <on_update_action>RESTRICT</on_update_action>
  4629 + <referenced_column>null</referenced_column>
  4630 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  4631 + </relation>
  4632 + <relation>
  4633 + <id>14</id>
  4634 + <source>9</source>
  4635 + <target>16</target>
  4636 + <source_xp>-1</source_xp>
  4637 + <source_yp>-1</source_yp>
  4638 + <target_xp>-1</target_xp>
  4639 + <target_yp>-1</target_yp>
  4640 + <color>
  4641 + <r>0</r>
  4642 + <g>0</g>
  4643 + <b>0</b>
  4644 + </color>
  4645 + <child_cardinality>1..n</child_cardinality>
  4646 + <parent_cardinality>1</parent_cardinality>
  4647 + <reference_for_pk>true</reference_for_pk>
  4648 + <name></name>
  4649 + <on_delete_action>RESTRICT</on_delete_action>
  4650 + <on_update_action>RESTRICT</on_update_action>
  4651 + <referenced_column>null</referenced_column>
  4652 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  4653 + </relation>
  4654 + </connections>
  4655 + <physical_name>i3geoestat_mapa_tema</physical_name>
  4656 + <logical_name>i3geoestat_mapa_tema</logical_name>
  4657 + <description></description>
  4658 + <constraint></constraint>
  4659 + <primary_key_name></primary_key_name>
  4660 + <option></option>
  4661 + <columns>
4289 4662 <normal_column>
4290   - <word_id>20</word_id>
4291   - <id>77</id>
  4663 + <word_id>36</word_id>
  4664 + <id>76</id>
4292 4665 <description></description>
4293 4666 <unique_key_name></unique_key_name>
4294 4667 <logical_name></logical_name>
4295 4668 <physical_name></physical_name>
4296   - <type>text</type>
  4669 + <type>integer</type>
4297 4670 <constraint></constraint>
4298 4671 <default_value></default_value>
4299   - <auto_increment>false</auto_increment>
  4672 + <auto_increment>true</auto_increment>
4300 4673 <foreign_key>false</foreign_key>
4301   - <not_null>false</not_null>
4302   - <primary_key>false</primary_key>
4303   - <unique_key>false</unique_key>
  4674 + <not_null>true</not_null>
  4675 + <primary_key>true</primary_key>
  4676 + <unique_key>true</unique_key>
4304 4677 <character_set></character_set>
4305 4678 <collation></collation>
4306 4679 <sequence>
... ... @@ -4311,6 +4684,7 @@
4311 4684 <max_value></max_value>
4312 4685 <start></start>
4313 4686 <cache></cache>
  4687 + <nocache>false</nocache>
4314 4688 <cycle>false</cycle>
4315 4689 <order>false</order>
4316 4690 <description></description>
... ... @@ -4319,17 +4693,18 @@
4319 4693 </sequence>
4320 4694 </normal_column>
4321 4695 <normal_column>
4322   - <word_id>38</word_id>
4323   - <id>78</id>
  4696 + <id>77</id>
  4697 + <referenced_column>73</referenced_column>
  4698 + <relation>13</relation>
4324 4699 <description></description>
4325 4700 <unique_key_name></unique_key_name>
4326 4701 <logical_name></logical_name>
4327 4702 <physical_name></physical_name>
4328 4703 <type>integer</type>
4329 4704 <constraint></constraint>
4330   - <default_value>0</default_value>
  4705 + <default_value></default_value>
4331 4706 <auto_increment>false</auto_increment>
4332   - <foreign_key>false</foreign_key>
  4707 + <foreign_key>true</foreign_key>
4333 4708 <not_null>false</not_null>
4334 4709 <primary_key>false</primary_key>
4335 4710 <unique_key>false</unique_key>
... ... @@ -4343,6 +4718,7 @@
4343 4718 <max_value></max_value>
4344 4719 <start></start>
4345 4720 <cache></cache>
  4721 + <nocache>false</nocache>
4346 4722 <cycle>false</cycle>
4347 4723 <order>false</order>
4348 4724 <description></description>
... ... @@ -4351,18 +4727,17 @@
4351 4727 </sequence>
4352 4728 </normal_column>
4353 4729 <normal_column>
4354   - <id>79</id>
4355   - <referenced_column>33</referenced_column>
4356   - <relation>12</relation>
  4730 + <word_id>72</word_id>
  4731 + <id>78</id>
4357 4732 <description></description>
4358 4733 <unique_key_name></unique_key_name>
4359 4734 <logical_name></logical_name>
4360 4735 <physical_name></physical_name>
4361   - <type>integer</type>
  4736 + <type>text</type>
4362 4737 <constraint></constraint>
4363 4738 <default_value></default_value>
4364 4739 <auto_increment>false</auto_increment>
4365   - <foreign_key>true</foreign_key>
  4740 + <foreign_key>false</foreign_key>
4366 4741 <not_null>false</not_null>
4367 4742 <primary_key>false</primary_key>
4368 4743 <unique_key>false</unique_key>
... ... @@ -4376,6 +4751,7 @@
4376 4751 <max_value></max_value>
4377 4752 <start></start>
4378 4753 <cache></cache>
  4754 + <nocache>false</nocache>
4379 4755 <cycle>false</cycle>
4380 4756 <order>false</order>
4381 4757 <description></description>
... ... @@ -4384,17 +4760,18 @@
4384 4760 </sequence>
4385 4761 </normal_column>
4386 4762 <normal_column>
4387   - <word_id>69</word_id>
4388   - <id>80</id>
  4763 + <id>79</id>
  4764 + <referenced_column>33</referenced_column>
  4765 + <relation>14</relation>
4389 4766 <description></description>
4390 4767 <unique_key_name></unique_key_name>
4391 4768 <logical_name></logical_name>
4392 4769 <physical_name></physical_name>
4393 4770 <type>integer</type>
4394 4771 <constraint></constraint>
4395   - <default_value>0</default_value>
  4772 + <default_value></default_value>
4396 4773 <auto_increment>false</auto_increment>
4397   - <foreign_key>false</foreign_key>
  4774 + <foreign_key>true</foreign_key>
4398 4775 <not_null>false</not_null>
4399 4776 <primary_key>false</primary_key>
4400 4777 <unique_key>false</unique_key>
... ... @@ -4408,6 +4785,7 @@
4408 4785 <max_value></max_value>
4409 4786 <start></start>
4410 4787 <cache></cache>
  4788 + <nocache>false</nocache>
4411 4789 <cycle>false</cycle>
4412 4790 <order>false</order>
4413 4791 <description></description>
... ... @@ -4425,30 +4803,52 @@
4425 4803 </table_properties>
4426 4804 </table>
4427 4805 <table>
4428   - <id>15</id>
4429   - <height>170</height>
4430   - <width>187</width>
  4806 + <id>17</id>
  4807 + <height>338</height>
  4808 + <width>292</width>
4431 4809 <font_name>Ubuntu</font_name>
4432 4810 <font_size>9</font_size>
4433   - <x>1063</x>
4434   - <y>620</y>
  4811 + <x>-341</x>
  4812 + <y>222</y>
4435 4813 <color>
4436 4814 <r>255</r>
4437 4815 <g>128</g>
4438 4816 <b>255</b>
4439 4817 </color>
4440 4818 <connections>
  4819 + <relation>
  4820 + <id>15</id>
  4821 + <source>11</source>
  4822 + <target>17</target>
  4823 + <source_xp>-1</source_xp>
  4824 + <source_yp>-1</source_yp>
  4825 + <target_xp>-1</target_xp>
  4826 + <target_yp>-1</target_yp>
  4827 + <color>
  4828 + <r>0</r>
  4829 + <g>0</g>
  4830 + <b>0</b>
  4831 + </color>
  4832 + <child_cardinality>1..n</child_cardinality>
  4833 + <parent_cardinality>0..1</parent_cardinality>
  4834 + <reference_for_pk>true</reference_for_pk>
  4835 + <name></name>
  4836 + <on_delete_action>RESTRICT</on_delete_action>
  4837 + <on_update_action>RESTRICT</on_update_action>
  4838 + <referenced_column>null</referenced_column>
  4839 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  4840 + </relation>
4441 4841 </connections>
4442   - <physical_name>i3geoestat_mapa</physical_name>
4443   - <logical_name>i3geoestat_mapa</logical_name>
4444   - <description></description>
  4842 + <physical_name>i3geoestat_tipo_regiao</physical_name>
  4843 + <logical_name>i3geoestat_tipo_regiao</logical_name>
  4844 + <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
4445 4845 <constraint></constraint>
4446 4846 <primary_key_name></primary_key_name>
4447 4847 <option></option>
4448 4848 <columns>
4449 4849 <normal_column>
4450   - <word_id>34</word_id>
4451   - <id>81</id>
  4850 + <word_id>5</word_id>
  4851 + <id>80</id>
4452 4852 <description></description>
4453 4853 <unique_key_name></unique_key_name>
4454 4854 <logical_name></logical_name>
... ... @@ -4471,6 +4871,7 @@
4471 4871 <max_value></max_value>
4472 4872 <start></start>
4473 4873 <cache></cache>
  4874 + <nocache>false</nocache>
4474 4875 <cycle>false</cycle>
4475 4876 <order>false</order>
4476 4877 <description></description>
... ... @@ -4479,8 +4880,8 @@
4479 4880 </sequence>
4480 4881 </normal_column>
4481 4882 <normal_column>
4482   - <word_id>70</word_id>
4483   - <id>82</id>
  4883 + <word_id>51</word_id>
  4884 + <id>81</id>
4484 4885 <description></description>
4485 4886 <unique_key_name></unique_key_name>
4486 4887 <logical_name></logical_name>
... ... @@ -4503,6 +4904,7 @@
4503 4904 <max_value></max_value>
4504 4905 <start></start>
4505 4906 <cache></cache>
  4907 + <nocache>false</nocache>
4506 4908 <cycle>false</cycle>
4507 4909 <order>false</order>
4508 4910 <description></description>
... ... @@ -4511,8 +4913,8 @@
4511 4913 </sequence>
4512 4914 </normal_column>
4513 4915 <normal_column>
4514   - <word_id>68</word_id>
4515   - <id>83</id>
  4916 + <word_id>22</word_id>
  4917 + <id>82</id>
4516 4918 <description></description>
4517 4919 <unique_key_name></unique_key_name>
4518 4920 <logical_name></logical_name>
... ... @@ -4535,6 +4937,7 @@
4535 4937 <max_value></max_value>
4536 4938 <start></start>
4537 4939 <cache></cache>
  4940 + <nocache>false</nocache>
4538 4941 <cycle>false</cycle>
4539 4942 <order>false</order>
4540 4943 <description></description>
... ... @@ -4543,7 +4946,41 @@
4543 4946 </sequence>
4544 4947 </normal_column>
4545 4948 <normal_column>
4546   - <word_id>43</word_id>
  4949 + <id>83</id>
  4950 + <referenced_column>50</referenced_column>
  4951 + <relation>15</relation>
  4952 + <description></description>
  4953 + <unique_key_name></unique_key_name>
  4954 + <logical_name></logical_name>
  4955 + <physical_name></physical_name>
  4956 + <type>integer</type>
  4957 + <constraint></constraint>
  4958 + <default_value></default_value>
  4959 + <auto_increment>false</auto_increment>
  4960 + <foreign_key>true</foreign_key>
  4961 + <not_null>false</not_null>
  4962 + <primary_key>false</primary_key>
  4963 + <unique_key>false</unique_key>
  4964 + <character_set></character_set>
  4965 + <collation></collation>
  4966 + <sequence>
  4967 + <name></name>
  4968 + <schema></schema>
  4969 + <increment></increment>
  4970 + <min_value></min_value>
  4971 + <max_value></max_value>
  4972 + <start></start>
  4973 + <cache></cache>
  4974 + <nocache>false</nocache>
  4975 + <cycle>false</cycle>
  4976 + <order>false</order>
  4977 + <description></description>
  4978 + <data_type></data_type>
  4979 + <decimal_size>0</decimal_size>
  4980 + </sequence>
  4981 + </normal_column>
  4982 + <normal_column>
  4983 + <word_id>24</word_id>
4547 4984 <id>84</id>
4548 4985 <description></description>
4549 4986 <unique_key_name></unique_key_name>
... ... @@ -4567,6 +5004,7 @@
4567 5004 <max_value></max_value>
4568 5005 <start></start>
4569 5006 <cache></cache>
  5007 + <nocache>false</nocache>
4570 5008 <cycle>false</cycle>
4571 5009 <order>false</order>
4572 5010 <description></description>
... ... @@ -4575,7 +5013,7 @@
4575 5013 </sequence>
4576 5014 </normal_column>
4577 5015 <normal_column>
4578   - <word_id>42</word_id>
  5016 + <word_id>66</word_id>
4579 5017 <id>85</id>
4580 5018 <description></description>
4581 5019 <unique_key_name></unique_key_name>
... ... @@ -4599,6 +5037,7 @@
4599 5037 <max_value></max_value>
4600 5038 <start></start>
4601 5039 <cache></cache>
  5040 + <nocache>false</nocache>
4602 5041 <cycle>false</cycle>
4603 5042 <order>false</order>
4604 5043 <description></description>
... ... @@ -4607,13 +5046,13 @@
4607 5046 </sequence>
4608 5047 </normal_column>
4609 5048 <normal_column>
4610   - <word_id>60</word_id>
  5049 + <word_id>11</word_id>
4611 5050 <id>86</id>
4612 5051 <description></description>
4613 5052 <unique_key_name></unique_key_name>
4614 5053 <logical_name></logical_name>
4615 5054 <physical_name></physical_name>
4616   - <type>integer</type>
  5055 + <type>text</type>
4617 5056 <constraint></constraint>
4618 5057 <default_value></default_value>
4619 5058 <auto_increment>false</auto_increment>
... ... @@ -4631,6 +5070,7 @@
4631 5070 <max_value></max_value>
4632 5071 <start></start>
4633 5072 <cache></cache>
  5073 + <nocache>false</nocache>
4634 5074 <cycle>false</cycle>
4635 5075 <order>false</order>
4636 5076 <description></description>
... ... @@ -4638,69 +5078,21 @@
4638 5078 <decimal_size>0</decimal_size>
4639 5079 </sequence>
4640 5080 </normal_column>
4641   - </columns>
4642   - <indexes>
4643   - </indexes>
4644   - <complex_unique_key_list>
4645   - </complex_unique_key_list>
4646   - <table_properties>
4647   - <schema></schema>
4648   - </table_properties>
4649   - </table>
4650   - <table>
4651   - <id>16</id>
4652   - <height>107</height>
4653   - <width>233</width>
4654   - <font_name>Ubuntu</font_name>
4655   - <font_size>9</font_size>
4656   - <x>952</x>
4657   - <y>858</y>
4658   - <color>
4659   - <r>255</r>
4660   - <g>128</g>
4661   - <b>255</b>
4662   - </color>
4663   - <connections>
4664   - <relation>
4665   - <id>13</id>
4666   - <source>15</source>
4667   - <target>16</target>
4668   - <child_cardinality>1..n</child_cardinality>
4669   - <parent_cardinality>1</parent_cardinality>
4670   - <reference_for_pk>true</reference_for_pk>
4671   - <name></name>
4672   - <on_delete_action>RESTRICT</on_delete_action>
4673   - <on_update_action>RESTRICT</on_update_action>
4674   - <source_xp>-1</source_xp>
4675   - <source_yp>-1</source_yp>
4676   - <target_xp>-1</target_xp>
4677   - <target_yp>-1</target_yp>
4678   - <referenced_column>null</referenced_column>
4679   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
4680   - </relation>
4681   - </connections>
4682   - <physical_name>i3geoestat_mapa_grupo</physical_name>
4683   - <logical_name>i3geoestat_mapa_grupo</logical_name>
4684   - <description></description>
4685   - <constraint></constraint>
4686   - <primary_key_name></primary_key_name>
4687   - <option></option>
4688   - <columns>
4689 5081 <normal_column>
4690   - <word_id>35</word_id>
  5082 + <word_id>18</word_id>
4691 5083 <id>87</id>
4692 5084 <description></description>
4693 5085 <unique_key_name></unique_key_name>
4694 5086 <logical_name></logical_name>
4695 5087 <physical_name></physical_name>
4696   - <type>integer</type>
  5088 + <type>text</type>
4697 5089 <constraint></constraint>
4698 5090 <default_value></default_value>
4699   - <auto_increment>true</auto_increment>
  5091 + <auto_increment>false</auto_increment>
4700 5092 <foreign_key>false</foreign_key>
4701   - <not_null>true</not_null>
4702   - <primary_key>true</primary_key>
4703   - <unique_key>true</unique_key>
  5093 + <not_null>false</not_null>
  5094 + <primary_key>false</primary_key>
  5095 + <unique_key>false</unique_key>
4704 5096 <character_set></character_set>
4705 5097 <collation></collation>
4706 5098 <sequence>
... ... @@ -4711,6 +5103,7 @@
4711 5103 <max_value></max_value>
4712 5104 <start></start>
4713 5105 <cache></cache>
  5106 + <nocache>false</nocache>
4714 5107 <cycle>false</cycle>
4715 5108 <order>false</order>
4716 5109 <description></description>
... ... @@ -4719,18 +5112,17 @@
4719 5112 </sequence>
4720 5113 </normal_column>
4721 5114 <normal_column>
  5115 + <word_id>28</word_id>
4722 5116 <id>88</id>
4723   - <referenced_column>81</referenced_column>
4724   - <relation>13</relation>
4725 5117 <description></description>
4726 5118 <unique_key_name></unique_key_name>
4727 5119 <logical_name></logical_name>
4728 5120 <physical_name></physical_name>
4729   - <type>integer</type>
  5121 + <type>text</type>
4730 5122 <constraint></constraint>
4731 5123 <default_value></default_value>
4732 5124 <auto_increment>false</auto_increment>
4733   - <foreign_key>true</foreign_key>
  5125 + <foreign_key>false</foreign_key>
4734 5126 <not_null>false</not_null>
4735 5127 <primary_key>false</primary_key>
4736 5128 <unique_key>false</unique_key>
... ... @@ -4744,6 +5136,7 @@
4744 5136 <max_value></max_value>
4745 5137 <start></start>
4746 5138 <cache></cache>
  5139 + <nocache>false</nocache>
4747 5140 <cycle>false</cycle>
4748 5141 <order>false</order>
4749 5142 <description></description>
... ... @@ -4752,7 +5145,7 @@
4752 5145 </sequence>
4753 5146 </normal_column>
4754 5147 <normal_column>
4755   - <word_id>71</word_id>
  5148 + <word_id>15</word_id>
4756 5149 <id>89</id>
4757 5150 <description></description>
4758 5151 <unique_key_name></unique_key_name>
... ... @@ -4776,6 +5169,7 @@
4776 5169 <max_value></max_value>
4777 5170 <start></start>
4778 5171 <cache></cache>
  5172 + <nocache>false</nocache>
4779 5173 <cycle>false</cycle>
4780 5174 <order>false</order>
4781 5175 <description></description>
... ... @@ -4783,86 +5177,21 @@
4783 5177 <decimal_size>0</decimal_size>
4784 5178 </sequence>
4785 5179 </normal_column>
4786   - </columns>
4787   - <indexes>
4788   - </indexes>
4789   - <complex_unique_key_list>
4790   - </complex_unique_key_list>
4791   - <table_properties>
4792   - <schema></schema>
4793   - </table_properties>
4794   - </table>
4795   - <table>
4796   - <id>17</id>
4797   - <height>128</height>
4798   - <width>269</width>
4799   - <font_name>Ubuntu</font_name>
4800   - <font_size>9</font_size>
4801   - <x>604</x>
4802   - <y>657</y>
4803   - <color>
4804   - <r>255</r>
4805   - <g>128</g>
4806   - <b>255</b>
4807   - </color>
4808   - <connections>
4809   - <relation>
4810   - <id>14</id>
4811   - <source>16</source>
4812   - <target>17</target>
4813   - <child_cardinality>1..n</child_cardinality>
4814   - <parent_cardinality>1</parent_cardinality>
4815   - <reference_for_pk>true</reference_for_pk>
4816   - <name></name>
4817   - <on_delete_action>RESTRICT</on_delete_action>
4818   - <on_update_action>RESTRICT</on_update_action>
4819   - <source_xp>-1</source_xp>
4820   - <source_yp>-1</source_yp>
4821   - <target_xp>-1</target_xp>
4822   - <target_yp>-1</target_yp>
4823   - <referenced_column>null</referenced_column>
4824   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
4825   - </relation>
4826   - <relation>
4827   - <id>15</id>
4828   - <source>9</source>
4829   - <target>17</target>
4830   - <child_cardinality>1..n</child_cardinality>
4831   - <parent_cardinality>1</parent_cardinality>
4832   - <reference_for_pk>true</reference_for_pk>
4833   - <name></name>
4834   - <on_delete_action>RESTRICT</on_delete_action>
4835   - <on_update_action>RESTRICT</on_update_action>
4836   - <source_xp>-1</source_xp>
4837   - <source_yp>-1</source_yp>
4838   - <target_xp>-1</target_xp>
4839   - <target_yp>-1</target_yp>
4840   - <referenced_column>null</referenced_column>
4841   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
4842   - </relation>
4843   - </connections>
4844   - <physical_name>i3geoestat_mapa_tema</physical_name>
4845   - <logical_name>i3geoestat_mapa_tema</logical_name>
4846   - <description></description>
4847   - <constraint></constraint>
4848   - <primary_key_name></primary_key_name>
4849   - <option></option>
4850   - <columns>
4851 5180 <normal_column>
4852   - <word_id>36</word_id>
  5181 + <word_id>64</word_id>
4853 5182 <id>90</id>
4854 5183 <description></description>
4855 5184 <unique_key_name></unique_key_name>
4856 5185 <logical_name></logical_name>
4857 5186 <physical_name></physical_name>
4858   - <type>integer</type>
  5187 + <type>text</type>
4859 5188 <constraint></constraint>
4860   - <default_value></default_value>
4861   - <auto_increment>true</auto_increment>
  5189 + <default_value>4326</default_value>
  5190 + <auto_increment>false</auto_increment>
4862 5191 <foreign_key>false</foreign_key>
4863   - <not_null>true</not_null>
4864   - <primary_key>true</primary_key>
4865   - <unique_key>true</unique_key>
  5192 + <not_null>false</not_null>
  5193 + <primary_key>false</primary_key>
  5194 + <unique_key>false</unique_key>
4866 5195 <character_set></character_set>
4867 5196 <collation></collation>
4868 5197 <sequence>
... ... @@ -4873,6 +5202,7 @@
4873 5202 <max_value></max_value>
4874 5203 <start></start>
4875 5204 <cache></cache>
  5205 + <nocache>false</nocache>
4876 5206 <cycle>false</cycle>
4877 5207 <order>false</order>
4878 5208 <description></description>
... ... @@ -4881,18 +5211,17 @@
4881 5211 </sequence>
4882 5212 </normal_column>
4883 5213 <normal_column>
  5214 + <word_id>10</word_id>
4884 5215 <id>91</id>
4885   - <referenced_column>87</referenced_column>
4886   - <relation>14</relation>
4887 5216 <description></description>
4888 5217 <unique_key_name></unique_key_name>
4889 5218 <logical_name></logical_name>
4890 5219 <physical_name></physical_name>
4891   - <type>integer</type>
  5220 + <type>text</type>
4892 5221 <constraint></constraint>
4893 5222 <default_value></default_value>
4894 5223 <auto_increment>false</auto_increment>
4895   - <foreign_key>true</foreign_key>
  5224 + <foreign_key>false</foreign_key>
4896 5225 <not_null>false</not_null>
4897 5226 <primary_key>false</primary_key>
4898 5227 <unique_key>false</unique_key>
... ... @@ -4906,6 +5235,7 @@
4906 5235 <max_value></max_value>
4907 5236 <start></start>
4908 5237 <cache></cache>
  5238 + <nocache>false</nocache>
4909 5239 <cycle>false</cycle>
4910 5240 <order>false</order>
4911 5241 <description></description>
... ... @@ -4914,7 +5244,7 @@
4914 5244 </sequence>
4915 5245 </normal_column>
4916 5246 <normal_column>
4917   - <word_id>72</word_id>
  5247 + <word_id>16</word_id>
4918 5248 <id>92</id>
4919 5249 <description></description>
4920 5250 <unique_key_name></unique_key_name>
... ... @@ -4938,6 +5268,7 @@
4938 5268 <max_value></max_value>
4939 5269 <start></start>
4940 5270 <cache></cache>
  5271 + <nocache>false</nocache>
4941 5272 <cycle>false</cycle>
4942 5273 <order>false</order>
4943 5274 <description></description>
... ... @@ -4946,18 +5277,17 @@
4946 5277 </sequence>
4947 5278 </normal_column>
4948 5279 <normal_column>
  5280 + <word_id>0</word_id>
4949 5281 <id>93</id>
4950   - <referenced_column>33</referenced_column>
4951   - <relation>15</relation>
4952 5282 <description></description>
4953 5283 <unique_key_name></unique_key_name>
4954 5284 <logical_name></logical_name>
4955 5285 <physical_name></physical_name>
4956   - <type>integer</type>
  5286 + <type>text</type>
4957 5287 <constraint></constraint>
4958 5288 <default_value></default_value>
4959 5289 <auto_increment>false</auto_increment>
4960   - <foreign_key>true</foreign_key>
  5290 + <foreign_key>false</foreign_key>
4961 5291 <not_null>false</not_null>
4962 5292 <primary_key>false</primary_key>
4963 5293 <unique_key>false</unique_key>
... ... @@ -4971,6 +5301,7 @@
4971 5301 <max_value></max_value>
4972 5302 <start></start>
4973 5303 <cache></cache>
  5304 + <nocache>false</nocache>
4974 5305 <cycle>false</cycle>
4975 5306 <order>false</order>
4976 5307 <description></description>
... ... @@ -5258,179 +5589,179 @@
5258 5589 </repeat_test_data>
5259 5590 </table_test_data>
5260 5591 <table_test_data>
5261   - <table_id>12</table_id>
  5592 + <table_id>17</table_id>
5262 5593 <direct_test_data>
5263 5594 <data>
5264 5595 <column_data>
5265   - <column_id>56</column_id>
  5596 + <column_id>80</column_id>
5266 5597 <value>2</value>
5267 5598 </column_data>
5268 5599 <column_data>
5269   - <column_id>57</column_id>
  5600 + <column_id>81</column_id>
5270 5601 <value>Município</value>
5271 5602 </column_data>
5272 5603 <column_data>
5273   - <column_id>58</column_id>
  5604 + <column_id>82</column_id>
5274 5605 <value>Limites municipais</value>
5275 5606 </column_data>
5276 5607 <column_data>
5277   - <column_id>59</column_id>
  5608 + <column_id>83</column_id>
5278 5609 <value>1</value>
5279 5610 </column_data>
5280 5611 <column_data>
5281   - <column_id>60</column_id>
  5612 + <column_id>84</column_id>
5282 5613 <value>i3geo_metaestat</value>
5283 5614 </column_data>
5284 5615 <column_data>
5285   - <column_id>61</column_id>
  5616 + <column_id>85</column_id>
5286 5617 <value>municipios</value>
5287 5618 </column_data>
5288 5619 <column_data>
5289   - <column_id>62</column_id>
  5620 + <column_id>86</column_id>
5290 5621 <value>the_geom</value>
5291 5622 </column_data>
5292 5623 <column_data>
5293   - <column_id>63</column_id>
  5624 + <column_id>87</column_id>
5294 5625 <value>2010</value>
5295 5626 </column_data>
5296 5627 <column_data>
5297   - <column_id>64</column_id>
  5628 + <column_id>88</column_id>
5298 5629 <value>co_municipio</value>
5299 5630 </column_data>
5300 5631 <column_data>
5301   - <column_id>65</column_id>
  5632 + <column_id>89</column_id>
5302 5633 <value>no_cidade</value>
5303 5634 </column_data>
5304 5635 <column_data>
5305   - <column_id>66</column_id>
  5636 + <column_id>90</column_id>
5306 5637 <value>4326</value>
5307 5638 </column_data>
5308 5639 <column_data>
5309   - <column_id>67</column_id>
  5640 + <column_id>91</column_id>
5310 5641 <value>the_geom2</value>
5311 5642 </column_data>
5312 5643 <column_data>
5313   - <column_id>68</column_id>
  5644 + <column_id>92</column_id>
5314 5645 <value>co_municipio,no_cidade,co_uf,sg_uf,area_territorial,nu_ano_instalacao</value>
5315 5646 </column_data>
5316 5647 <column_data>
5317   - <column_id>69</column_id>
  5648 + <column_id>93</column_id>
5318 5649 <value>Código ibge,Nome,Código UF,UF,Área,Ano de criação</value>
5319 5650 </column_data>
5320 5651 </data>
5321 5652 <data>
5322 5653 <column_data>
5323   - <column_id>56</column_id>
  5654 + <column_id>80</column_id>
5324 5655 <value>3</value>
5325 5656 </column_data>
5326 5657 <column_data>
5327   - <column_id>57</column_id>
  5658 + <column_id>81</column_id>
5328 5659 <value>Estado</value>
5329 5660 </column_data>
5330 5661 <column_data>
5331   - <column_id>58</column_id>
  5662 + <column_id>82</column_id>
5332 5663 <value>Limites estaduais</value>
5333 5664 </column_data>
5334 5665 <column_data>
5335   - <column_id>59</column_id>
  5666 + <column_id>83</column_id>
5336 5667 <value>1</value>
5337 5668 </column_data>
5338 5669 <column_data>
5339   - <column_id>60</column_id>
  5670 + <column_id>84</column_id>
5340 5671 <value>i3geo_metaestat</value>
5341 5672 </column_data>
5342 5673 <column_data>
5343   - <column_id>61</column_id>
  5674 + <column_id>85</column_id>
5344 5675 <value>uf</value>
5345 5676 </column_data>
5346 5677 <column_data>
5347   - <column_id>62</column_id>
  5678 + <column_id>86</column_id>
5348 5679 <value>the_geom</value>
5349 5680 </column_data>
5350 5681 <column_data>
5351   - <column_id>63</column_id>
  5682 + <column_id>87</column_id>
5352 5683 <value>2010</value>
5353 5684 </column_data>
5354 5685 <column_data>
5355   - <column_id>64</column_id>
  5686 + <column_id>88</column_id>
5356 5687 <value>co_uf</value>
5357 5688 </column_data>
5358 5689 <column_data>
5359   - <column_id>65</column_id>
  5690 + <column_id>89</column_id>
5360 5691 <value>no_uf</value>
5361 5692 </column_data>
5362 5693 <column_data>
5363   - <column_id>66</column_id>
  5694 + <column_id>90</column_id>
5364 5695 <value>4326</value>
5365 5696 </column_data>
5366 5697 <column_data>
5367   - <column_id>67</column_id>
  5698 + <column_id>91</column_id>
5368 5699 <value>the_geom</value>
5369 5700 </column_data>
5370 5701 <column_data>
5371   - <column_id>68</column_id>
  5702 + <column_id>92</column_id>
5372 5703 <value>co_uf,sg_uf,no_uf,no_regiao</value>
5373 5704 </column_data>
5374 5705 <column_data>
5375   - <column_id>69</column_id>
  5706 + <column_id>93</column_id>
5376 5707 <value>Código UF,Sigla,Nome</value>
5377 5708 </column_data>
5378 5709 </data>
5379 5710 <data>
5380 5711 <column_data>
5381   - <column_id>56</column_id>
  5712 + <column_id>80</column_id>
5382 5713 <value>1</value>
5383 5714 </column_data>
5384 5715 <column_data>
5385   - <column_id>57</column_id>
  5716 + <column_id>81</column_id>
5386 5717 <value>Bairro</value>
5387 5718 </column_data>
5388 5719 <column_data>
5389   - <column_id>58</column_id>
  5720 + <column_id>82</column_id>
5390 5721 <value>Limites de bairros</value>
5391 5722 </column_data>
5392 5723 <column_data>
5393   - <column_id>59</column_id>
  5724 + <column_id>83</column_id>
5394 5725 <value>1</value>
5395 5726 </column_data>
5396 5727 <column_data>
5397   - <column_id>60</column_id>
  5728 + <column_id>84</column_id>
5398 5729 <value>i3geo_metaestat</value>
5399 5730 </column_data>
5400 5731 <column_data>
5401   - <column_id>61</column_id>
  5732 + <column_id>85</column_id>
5402 5733 <value>bairros</value>
5403 5734 </column_data>
5404 5735 <column_data>
5405   - <column_id>62</column_id>
  5736 + <column_id>86</column_id>
5406 5737 <value>the_geom</value>
5407 5738 </column_data>
5408 5739 <column_data>
5409   - <column_id>63</column_id>
  5740 + <column_id>87</column_id>
5410 5741 <value>2010</value>
5411 5742 </column_data>
5412 5743 <column_data>
5413   - <column_id>64</column_id>
  5744 + <column_id>88</column_id>
5414 5745 <value>co_bairro</value>
5415 5746 </column_data>
5416 5747 <column_data>
5417   - <column_id>65</column_id>
  5748 + <column_id>89</column_id>
5418 5749 <value>no_bairro</value>
5419 5750 </column_data>
5420 5751 <column_data>
5421   - <column_id>66</column_id>
  5752 + <column_id>90</column_id>
5422 5753 <value>4326</value>
5423 5754 </column_data>
5424 5755 <column_data>
5425   - <column_id>67</column_id>
  5756 + <column_id>91</column_id>
5426 5757 <value>the_geom</value>
5427 5758 </column_data>
5428 5759 <column_data>
5429   - <column_id>68</column_id>
  5760 + <column_id>92</column_id>
5430 5761 <value>co_bairro,no_bairro,no_distr,no_municip</value>
5431 5762 </column_data>
5432 5763 <column_data>
5433   - <column_id>69</column_id>
  5764 + <column_id>93</column_id>
5434 5765 <value>Código bairro,Nome,Distrito,Município</value>
5435 5766 </column_data>
5436 5767 </data>
... ... @@ -5439,7 +5770,7 @@
5439 5770 <test_data_num>0</test_data_num>
5440 5771 <data_def_list>
5441 5772 <data_def>
5442   - <column_id>56</column_id>
  5773 + <column_id>80</column_id>
5443 5774 <type>Format</type>
5444 5775 <repeat_num>1</repeat_num>
5445 5776 <template>%</template>
... ... @@ -5454,7 +5785,7 @@
5454 5785 </modified_values>
5455 5786 </data_def>
5456 5787 <data_def>
5457   - <column_id>57</column_id>
  5788 + <column_id>81</column_id>
5458 5789 <type>Format</type>
5459 5790 <repeat_num>1</repeat_num>
5460 5791 <template>nome_tipo_regiao%</template>
... ... @@ -5469,7 +5800,7 @@
5469 5800 </modified_values>
5470 5801 </data_def>
5471 5802 <data_def>
5472   - <column_id>58</column_id>
  5803 + <column_id>82</column_id>
5473 5804 <type>Format</type>
5474 5805 <repeat_num>1</repeat_num>
5475 5806 <template>descricao_tipo_regiao%</template>
... ... @@ -5484,7 +5815,7 @@
5484 5815 </modified_values>
5485 5816 </data_def>
5486 5817 <data_def>
5487   - <column_id>59</column_id>
  5818 + <column_id>83</column_id>
5488 5819 <type>Foreign Key</type>
5489 5820 <repeat_num>1</repeat_num>
5490 5821 <template>%</template>
... ... @@ -5499,7 +5830,7 @@
5499 5830 </modified_values>
5500 5831 </data_def>
5501 5832 <data_def>
5502   - <column_id>60</column_id>
  5833 + <column_id>84</column_id>
5503 5834 <type>Format</type>
5504 5835 <repeat_num>1</repeat_num>
5505 5836 <template>esquemadb%</template>
... ... @@ -5514,7 +5845,7 @@
5514 5845 </modified_values>
5515 5846 </data_def>
5516 5847 <data_def>
5517   - <column_id>61</column_id>
  5848 + <column_id>85</column_id>
5518 5849 <type>Format</type>
5519 5850 <repeat_num>1</repeat_num>
5520 5851 <template>tabela%</template>
... ... @@ -5529,7 +5860,7 @@
5529 5860 </modified_values>
5530 5861 </data_def>
5531 5862 <data_def>
5532   - <column_id>62</column_id>
  5863 + <column_id>86</column_id>
5533 5864 <type>Format</type>
5534 5865 <repeat_num>1</repeat_num>
5535 5866 <template>colunageo%</template>
... ... @@ -5544,7 +5875,7 @@
5544 5875 </modified_values>
5545 5876 </data_def>
5546 5877 <data_def>
5547   - <column_id>63</column_id>
  5878 + <column_id>87</column_id>
5548 5879 <type>Format</type>
5549 5880 <repeat_num>1</repeat_num>
5550 5881 <template>data%</template>
... ... @@ -5559,7 +5890,7 @@
5559 5890 </modified_values>
5560 5891 </data_def>
5561 5892 <data_def>
5562   - <column_id>64</column_id>
  5893 + <column_id>88</column_id>
5563 5894 <type>Format</type>
5564 5895 <repeat_num>1</repeat_num>
5565 5896 <template>%</template>
... ... @@ -5574,7 +5905,7 @@
5574 5905 </modified_values>
5575 5906 </data_def>
5576 5907 <data_def>
5577   - <column_id>65</column_id>
  5908 + <column_id>89</column_id>
5578 5909 <type>Format</type>
5579 5910 <repeat_num>1</repeat_num>
5580 5911 <template>colunanomeregiao%</template>
... ... @@ -5589,7 +5920,7 @@
5589 5920 </modified_values>
5590 5921 </data_def>
5591 5922 <data_def>
5592   - <column_id>66</column_id>
  5923 + <column_id>90</column_id>
5593 5924 <type>Format</type>
5594 5925 <repeat_num>1</repeat_num>
5595 5926 <template>srid%</template>
... ... @@ -5604,7 +5935,7 @@
5604 5935 </modified_values>
5605 5936 </data_def>
5606 5937 <data_def>
5607   - <column_id>67</column_id>
  5938 + <column_id>91</column_id>
5608 5939 <type>Format</type>
5609 5940 <repeat_num>1</repeat_num>
5610 5941 <template>colunacentroide%</template>
... ... @@ -5619,7 +5950,7 @@
5619 5950 </modified_values>
5620 5951 </data_def>
5621 5952 <data_def>
5622   - <column_id>68</column_id>
  5953 + <column_id>92</column_id>
5623 5954 <type>Format</type>
5624 5955 <repeat_num>1</repeat_num>
5625 5956 <template>colunasvisiveis%</template>
... ... @@ -5634,7 +5965,7 @@
5634 5965 </modified_values>
5635 5966 </data_def>
5636 5967 <data_def>
5637   - <column_id>69</column_id>
  5968 + <column_id>93</column_id>
5638 5969 <type>Format</type>
5639 5970 <repeat_num>1</repeat_num>
5640 5971 <template>alias%</template>
... ... @@ -6018,35 +6349,35 @@
6018 6349 </repeat_test_data>
6019 6350 </table_test_data>
6020 6351 <table_test_data>
6021   - <table_id>14</table_id>
  6352 + <table_id>13</table_id>
6022 6353 <direct_test_data>
6023 6354 <data>
6024 6355 <column_data>
6025   - <column_id>74</column_id>
  6356 + <column_id>60</column_id>
6026 6357 <value>1</value>
6027 6358 </column_data>
6028 6359 <column_data>
6029   - <column_id>75</column_id>
  6360 + <column_id>61</column_id>
6030 6361 <value>nu_ano</value>
6031 6362 </column_data>
6032 6363 <column_data>
6033   - <column_id>76</column_id>
  6364 + <column_id>62</column_id>
6034 6365 <value>ano</value>
6035 6366 </column_data>
6036 6367 <column_data>
6037   - <column_id>77</column_id>
  6368 + <column_id>63</column_id>
6038 6369 <value></value>
6039 6370 </column_data>
6040 6371 <column_data>
6041   - <column_id>78</column_id>
  6372 + <column_id>64</column_id>
6042 6373 <value>0</value>
6043 6374 </column_data>
6044 6375 <column_data>
6045   - <column_id>79</column_id>
  6376 + <column_id>65</column_id>
6046 6377 <value>1</value>
6047 6378 </column_data>
6048 6379 <column_data>
6049   - <column_id>80</column_id>
  6380 + <column_id>66</column_id>
6050 6381 <value>1</value>
6051 6382 </column_data>
6052 6383 </data>
... ... @@ -6055,7 +6386,7 @@
6055 6386 <test_data_num>0</test_data_num>
6056 6387 <data_def_list>
6057 6388 <data_def>
6058   - <column_id>74</column_id>
  6389 + <column_id>60</column_id>
6059 6390 <type>Format</type>
6060 6391 <repeat_num>1</repeat_num>
6061 6392 <template>%</template>
... ... @@ -6070,7 +6401,7 @@
6070 6401 </modified_values>
6071 6402 </data_def>
6072 6403 <data_def>
6073   - <column_id>75</column_id>
  6404 + <column_id>61</column_id>
6074 6405 <type>Format</type>
6075 6406 <repeat_num>1</repeat_num>
6076 6407 <template>coluna%</template>
... ... @@ -6085,7 +6416,7 @@
6085 6416 </modified_values>
6086 6417 </data_def>
6087 6418 <data_def>
6088   - <column_id>76</column_id>
  6419 + <column_id>62</column_id>
6089 6420 <type>Format</type>
6090 6421 <repeat_num>1</repeat_num>
6091 6422 <template>nomedimensao%</template>
... ... @@ -6100,7 +6431,7 @@
6100 6431 </modified_values>
6101 6432 </data_def>
6102 6433 <data_def>
6103   - <column_id>77</column_id>
  6434 + <column_id>63</column_id>
6104 6435 <type>Format</type>
6105 6436 <repeat_num>1</repeat_num>
6106 6437 <template>descricao%</template>
... ... @@ -6115,7 +6446,7 @@
6115 6446 </modified_values>
6116 6447 </data_def>
6117 6448 <data_def>
6118   - <column_id>78</column_id>
  6449 + <column_id>64</column_id>
6119 6450 <type>Format</type>
6120 6451 <repeat_num>1</repeat_num>
6121 6452 <template>%</template>
... ... @@ -6130,7 +6461,7 @@
6130 6461 </modified_values>
6131 6462 </data_def>
6132 6463 <data_def>
6133   - <column_id>79</column_id>
  6464 + <column_id>65</column_id>
6134 6465 <type>Foreign Key</type>
6135 6466 <repeat_num>1</repeat_num>
6136 6467 <template>%</template>
... ... @@ -6145,7 +6476,7 @@
6145 6476 </modified_values>
6146 6477 </data_def>
6147 6478 <data_def>
6148   - <column_id>80</column_id>
  6479 + <column_id>66</column_id>
6149 6480 <type>Format</type>
6150 6481 <repeat_num>1</repeat_num>
6151 6482 <template>%</template>
... ... @@ -6948,41 +7279,41 @@
6948 7279 </repeat_test_data>
6949 7280 </table_test_data>
6950 7281 <table_test_data>
6951   - <table_id>13</table_id>
  7282 + <table_id>12</table_id>
6952 7283 <direct_test_data>
6953 7284 <data>
6954 7285 <column_data>
6955   - <column_id>70</column_id>
  7286 + <column_id>56</column_id>
6956 7287 <value>1</value>
6957 7288 </column_data>
6958 7289 <column_data>
6959   - <column_id>71</column_id>
  7290 + <column_id>57</column_id>
6960 7291 <value>1</value>
6961 7292 </column_data>
6962 7293 <column_data>
6963   - <column_id>72</column_id>
  7294 + <column_id>58</column_id>
6964 7295 <value>2</value>
6965 7296 </column_data>
6966 7297 <column_data>
6967   - <column_id>73</column_id>
  7298 + <column_id>59</column_id>
6968 7299 <value>co_municipio</value>
6969 7300 </column_data>
6970 7301 </data>
6971 7302 <data>
6972 7303 <column_data>
6973   - <column_id>70</column_id>
  7304 + <column_id>56</column_id>
6974 7305 <value>2</value>
6975 7306 </column_data>
6976 7307 <column_data>
6977   - <column_id>71</column_id>
  7308 + <column_id>57</column_id>
6978 7309 <value>2</value>
6979 7310 </column_data>
6980 7311 <column_data>
6981   - <column_id>72</column_id>
  7312 + <column_id>58</column_id>
6982 7313 <value>3</value>
6983 7314 </column_data>
6984 7315 <column_data>
6985   - <column_id>73</column_id>
  7316 + <column_id>59</column_id>
6986 7317 <value>co_uf</value>
6987 7318 </column_data>
6988 7319 </data>
... ... @@ -6991,7 +7322,7 @@
6991 7322 <test_data_num>0</test_data_num>
6992 7323 <data_def_list>
6993 7324 <data_def>
6994   - <column_id>70</column_id>
  7325 + <column_id>56</column_id>
6995 7326 <type>Format</type>
6996 7327 <repeat_num>1</repeat_num>
6997 7328 <template>%</template>
... ... @@ -7006,7 +7337,7 @@
7006 7337 </modified_values>
7007 7338 </data_def>
7008 7339 <data_def>
7009   - <column_id>71</column_id>
  7340 + <column_id>57</column_id>
7010 7341 <type>Foreign Key</type>
7011 7342 <repeat_num>1</repeat_num>
7012 7343 <template>%</template>
... ... @@ -7021,7 +7352,7 @@
7021 7352 </modified_values>
7022 7353 </data_def>
7023 7354 <data_def>
7024   - <column_id>72</column_id>
  7355 + <column_id>58</column_id>
7025 7356 <type>Format</type>
7026 7357 <repeat_num>1</repeat_num>
7027 7358 <template>%</template>
... ... @@ -7036,7 +7367,7 @@
7036 7367 </modified_values>
7037 7368 </data_def>
7038 7369 <data_def>
7039   - <column_id>73</column_id>
  7370 + <column_id>59</column_id>
7040 7371 <type>Format</type>
7041 7372 <repeat_num>1</repeat_num>
7042 7373 <template>colunaligacao_regiaopai%</template>
... ...