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