Download as
Browse Code »

Commit 7646f864748539f82501c0c4671b62db2c75c5c8

Authored by Adriano Vieira
1 parent 1ff4d641
Exists in master and in 1 other branch 3.1

- merge de branch 2.6 [936] 

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@937 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 7 changed files with 10 additions and 10 deletions   Show diff stats
instalador/sql/cacic_create_tables.sql
  Diff comments   View file @7646f86
@@ -782,19 +782,19 @@ COMMENT = 'Log de Atividades no Sistema CACIC'; @@ -782,19 +782,19 @@ COMMENT = 'Log de Atividades no Sistema CACIC';
782 -- Table `srcacic_conexoes` 782 -- Table `srcacic_conexoes`
783 -- ----------------------------------------------------- 783 -- -----------------------------------------------------
784 CREATE TABLE IF NOT EXISTS `srcacic_conexoes` ( 784 CREATE TABLE IF NOT EXISTS `srcacic_conexoes` (
785 - `id_conexao` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'Identificador da conexão' , 785 + `id_conexao` INT(11) NOT NULL AUTO_INCREMENT COMMENT 'Identificador da conexão' ,
786 `id_sessao` INT(11) NOT NULL , 786 `id_sessao` INT(11) NOT NULL ,
787 `id_usuario_cli` INT(11) NOT NULL DEFAULT '0' , 787 `id_usuario_cli` INT(11) NOT NULL DEFAULT '0' ,
788 `te_node_address_cli` VARCHAR(17) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL , 788 `te_node_address_cli` VARCHAR(17) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
789 `te_documento_referencial` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL , 789 `te_documento_referencial` VARCHAR(60) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL ,
790 `id_so_cli` INT(11) NOT NULL , 790 `id_so_cli` INT(11) NOT NULL ,
791 - `te_motivo_conexao` TEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT 'Descritivo breve sobre o motivo da conexão' , 791 + `te_motivo_conexao` TEXT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT 'Descritivo breve sobre o motivo da conexão' ,
792 `dt_hr_inicio_conexao` DATETIME NOT NULL , 792 `dt_hr_inicio_conexao` DATETIME NOT NULL ,
793 `dt_hr_ultimo_contato` DATETIME NOT NULL , 793 `dt_hr_ultimo_contato` DATETIME NOT NULL ,
794 PRIMARY KEY (`id_conexao`) ) 794 PRIMARY KEY (`id_conexao`) )
795 ENGINE = InnoDB 795 ENGINE = InnoDB
796 DEFAULT CHARACTER SET = latin1 796 DEFAULT CHARACTER SET = latin1
797 -COMMENT = 'Registros de Conexões efetuadas às sessões abertas'; 797 +COMMENT = 'Registros de Conexões efetuadas às sessões abertas';
798 798
799 799
800 -- ----------------------------------------------------- 800 -- -----------------------------------------------------
@@ -949,7 +949,7 @@ DEFAULT CHARACTER SET = latin1; @@ -949,7 +949,7 @@ DEFAULT CHARACTER SET = latin1;
949 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 949 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
950 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 950 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
951 `te_std_language` VARCHAR(05) , 951 `te_std_language` VARCHAR(05) ,
952 - PRIMARY KEY (`id_usuario`) 952 + PRIMARY KEY (`id_usuario`) )
953 ENGINE = InnoDB 953 ENGINE = InnoDB
954 DEFAULT CHARACTER SET = latin1; 954 DEFAULT CHARACTER SET = latin1;
955 955
instalador/sql/cacic_fev2006.sql
  Diff comments   View file @7646f86
@@ -514,7 +514,7 @@ ALTER TABLE configuracoes_padrao @@ -514,7 +514,7 @@ ALTER TABLE configuracoes_padrao
514 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 514 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
515 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 515 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
516 `te_std_language` VARCHAR(05) , 516 `te_std_language` VARCHAR(05) ,
517 - PRIMARY KEY (`id_usuario`) 517 + PRIMARY KEY (`id_usuario`) )
518 ENGINE = InnoDB 518 ENGINE = InnoDB
519 DEFAULT CHARACTER SET = latin1; 519 DEFAULT CHARACTER SET = latin1;
520 520
instalador/sql/cacic_jun2005.sql
  Diff comments   View file @7646f86
@@ -530,7 +530,7 @@ ALTER TABLE configuracoes_padrao @@ -530,7 +530,7 @@ ALTER TABLE configuracoes_padrao
530 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 530 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
531 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 531 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
532 `te_std_language` VARCHAR(05) , 532 `te_std_language` VARCHAR(05) ,
533 - PRIMARY KEY (`id_usuario`) 533 + PRIMARY KEY (`id_usuario`) )
534 ENGINE = InnoDB 534 ENGINE = InnoDB
535 DEFAULT CHARACTER SET = latin1; 535 DEFAULT CHARACTER SET = latin1;
536 536
instalador/sql/cacic_v2.2.2.sql
  Diff comments   View file @7646f86
@@ -273,7 +273,7 @@ ALTER TABLE configuracoes_padrao @@ -273,7 +273,7 @@ ALTER TABLE configuracoes_padrao
273 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 273 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
274 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 274 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
275 `te_std_language` VARCHAR(05) , 275 `te_std_language` VARCHAR(05) ,
276 - PRIMARY KEY (`id_usuario`) 276 + PRIMARY KEY (`id_usuario`) )
277 ENGINE = InnoDB 277 ENGINE = InnoDB
278 DEFAULT CHARACTER SET = latin1; 278 DEFAULT CHARACTER SET = latin1;
279 279
instalador/sql/cacic_v2.4.0-rc1.sql
  Diff comments   View file @7646f86
@@ -119,7 +119,7 @@ ALTER TABLE configuracoes_padrao @@ -119,7 +119,7 @@ ALTER TABLE configuracoes_padrao
119 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 119 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
120 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 120 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
121 `te_std_language` VARCHAR(05) , 121 `te_std_language` VARCHAR(05) ,
122 - PRIMARY KEY (`id_usuario`) 122 + PRIMARY KEY (`id_usuario`) )
123 ENGINE = InnoDB 123 ENGINE = InnoDB
124 DEFAULT CHARACTER SET = latin1; 124 DEFAULT CHARACTER SET = latin1;
125 125
instalador/sql/cacic_v2.4.0-rc2.sql
  Diff comments   View file @7646f86
@@ -108,7 +108,7 @@ ALTER TABLE configuracoes_padrao @@ -108,7 +108,7 @@ ALTER TABLE configuracoes_padrao
108 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 108 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
109 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 109 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
110 `te_std_language` VARCHAR(05) , 110 `te_std_language` VARCHAR(05) ,
111 - PRIMARY KEY (`id_usuario`) 111 + PRIMARY KEY (`id_usuario`) )
112 ENGINE = InnoDB 112 ENGINE = InnoDB
113 DEFAULT CHARACTER SET = latin1; 113 DEFAULT CHARACTER SET = latin1;
114 114
instalador/sql/cacic_v2.4.0.sql
  Diff comments   View file @7646f86
@@ -107,7 +107,7 @@ ALTER TABLE configuracoes_padrao @@ -107,7 +107,7 @@ ALTER TABLE configuracoes_padrao
107 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` ( 107 CREATE TABLE IF NOT EXISTS `preferencia_usuarios` (
108 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , 108 `id_usuario` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
109 `te_std_language` VARCHAR(05) , 109 `te_std_language` VARCHAR(05) ,
110 - PRIMARY KEY (`id_usuario`) 110 + PRIMARY KEY (`id_usuario`) )
111 ENGINE = InnoDB 111 ENGINE = InnoDB
112 DEFAULT CHARACTER SET = latin1; 112 DEFAULT CHARACTER SET = latin1;
113 113