diff --git a/docker-compose.yml b/docker-compose.yml index 6a459f6..2fb9df6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,14 +7,14 @@ ieducar_1204: volumes: - .:/home/ieducar/ieducar links: - - postgres + - postgres95 container_name: ieducar_1204 -postgres: +postgres95: volumes: - /var/lib/postgresql/data image: postgres:9.5 environment: - POSTGRES_PASSWORD=postgres ports: - - "5433:5432" + - "5430:5432" diff --git a/ieducar/configuration/ieducar.ini b/ieducar/configuration/ieducar.ini index 1132dfb..4feca66 100644 --- a/ieducar/configuration/ieducar.ini +++ b/ieducar/configuration/ieducar.ini @@ -54,7 +54,7 @@ ; Configurações de banco de dados app.database.dbname = ieducar app.database.username = ieducar -app.database.hostname = postgres_95 +app.database.hostname = postgres95 app.database.password = ieducar app.database.port = 5433 diff --git a/ieducar/intranet/banner_lst.php b/ieducar/intranet/banner_lst.php index 8d4b641..e88c7a7 100755 --- a/ieducar/intranet/banner_lst.php +++ b/ieducar/intranet/banner_lst.php @@ -51,10 +51,10 @@ class indice extends clsListagem $db = new clsBanco(); - $soma_lateral = $db->UnicoCampo( "SELECT SUM(prioridade) FROM portal_banner WHERE lateral=1" ); - $soma_centro = $db->UnicoCampo( "SELECT SUM(prioridade) FROM portal_banner WHERE lateral=0" ); + $soma_lateral = $db->UnicoCampo( "SELECT SUM(prioridade) FROM portal_banner WHERE lateral_=1" ); + $soma_centro = $db->UnicoCampo( "SELECT SUM(prioridade) FROM portal_banner WHERE lateral_=0" ); - $db->Consulta( "SELECT cod_portal_banner, caminho, title, prioridade, link, lateral FROM portal_banner ORDER BY prioridade, title" ); + $db->Consulta( "SELECT cod_portal_banner, caminho, title, prioridade, link, lateral_ FROM portal_banner ORDER BY prioridade, title" ); while ($db->ProximoRegistro()) { list ($cod_portal_banner, $caminho, $title, $prioridade, $link, $lateral) = $db->Tupla(); diff --git a/ieducar/intranet/include/clsBase.inc.php b/ieducar/intranet/include/clsBase.inc.php index d3c8204..16c406a 100755 --- a/ieducar/intranet/include/clsBase.inc.php +++ b/ieducar/intranet/include/clsBase.inc.php @@ -624,7 +624,7 @@ class clsBase extends clsConfig { $retorno = ''; $listaBanners = array(); - $this->db()->Consulta("SELECT caminho, title, prioridade, link FROM portal_banner WHERE lateral=1 ORDER BY prioridade, title"); + $this->db()->Consulta("SELECT caminho, title, prioridade, link FROM portal_banner WHERE lateral_=1 ORDER BY prioridade, title"); while ($this->db()->ProximoRegistro()) { list($caminho, $title, $prioridade, $link) = $this->db()->Tupla(); diff --git a/ieducar/misc/database/migrations/20170312151236_atualiza_portal_banner_para_nova_versao_banco.php b/ieducar/misc/database/migrations/20170312151236_atualiza_portal_banner_para_nova_versao_banco.php new file mode 100644 index 0000000..0da9254 --- /dev/null +++ b/ieducar/misc/database/migrations/20170312151236_atualiza_portal_banner_para_nova_versao_banco.php @@ -0,0 +1,24 @@ +execute("CREATE SEQUENCE portal_banner_cod_portal_banner_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + MINVALUE 0 + CACHE 1; + CREATE TABLE portal_banner ( + cod_portal_banner integer DEFAULT nextval('portal_banner_cod_portal_banner_seq'::regclass) NOT NULL, + ref_ref_cod_pessoa_fj integer DEFAULT 0 NOT NULL, + caminho character varying(255) DEFAULT ''::character varying NOT NULL, + title character varying(255), + prioridade integer DEFAULT 0 NOT NULL, + link character varying(255) DEFAULT ''::character varying NOT NULL, + lateral_ smallint DEFAULT (1)::smallint NOT NULL);"); + } +} diff --git a/phinx.yml b/phinx.yml index 408af09..8d87513 100644 --- a/phinx.yml +++ b/phinx.yml @@ -10,6 +10,5 @@ environments: name: ieducar user: ieducar pass: 'ieducar' - port: 5433 - charset: latin1 - + port: 5430 + charset: utf8 -- libgit2 0.21.2