Altera consultas ao banco com códigos mais recente

portabilis · gustavomendess · Jul 6, 2020 · Apr 12, 2020 · Jun 11, 2019 · Jun 11, 2019
commit 1182c36aa3f4fbe872f5264001d8c993fec942cd
diff --git a/ieducar/intranet/include/modules/clsModulesComponenteCurricular.inc.php b/ieducar/intranet/include/modules/clsModulesComponenteCurricular.inc.php
@@ -49,7 +49,7 @@ public function lista($instituicao_id = null, $nome = null, $abreviatura = null,
         }
         if (is_string($nome)) {
             $name = $db->escapeString($nome);
-            $filtros .= "{$whereAnd} translate(upper(cc.nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$name}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} unaccent(cc.nome) ILIKE unaccent('%{$name}%')";
             $whereAnd = ' AND ';
         }
         if (is_string($abreviatura)) {

diff --git a/ieducar/intranet/include/modules/clsModulesEmpresaTransporteEscolar.inc.php b/ieducar/intranet/include/modules/clsModulesEmpresaTransporteEscolar.inc.php
@@ -190,25 +190,15 @@ public function lista(
             cadastro.pessoa
           WHERE
             cadastro.pessoa.idpes = ref_idpes
-            AND translate(upper(nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nome_idpes}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')
+            AND unaccent(nome) ILIKE unaccent('%{$nome_idpes}%')
         )";
 
             $whereAnd = ' AND ';
         }
 
         if (is_string($nm_resp_idpes)) {
             $nome_resp_idpes = $db->escapeString($nm_resp_idpes);
-            $filtros .= "
-        {$whereAnd} exists (
-          SELECT
-            1
-          FROM
-            cadastro.pessoa
-          WHERE
-            cadastro.pessoa.idpes = ref_resp_idpes
-            AND translate(upper(nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nome_resp_idpes}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')
-        )";
-
+            $filtros .= "{$whereAnd} exists(SELECT 1 FROM cadastro.pessoa WHERE unaccent(nome) ILIKE unaccent('%{$nome_resp_idpes}%'))";
             $whereAnd = ' AND ';
         }
 

diff --git a/ieducar/intranet/include/modules/clsModulesMotorista.inc.php b/ieducar/intranet/include/modules/clsModulesMotorista.inc.php
@@ -255,7 +255,7 @@ public function lista(
         if (is_string($nome_motorista)) {
             $nm_motorista = $db->escapeString($nome_motorista);
             $filtros .= "
-        {$whereAnd} translate(upper((SELECT nome FROM cadastro.pessoa WHERE idpes = ref_idpes)),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_motorista}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+        {$whereAnd} exists(SELECT * FROM cadastro.pessoa WHERE unaccent(nome) ILIKE unaccent('%{$nm_motorista}%'))";
 
             $whereAnd = ' AND ';
         }

diff --git a/ieducar/intranet/include/modules/clsModulesPessoaTransporte.inc.php b/ieducar/intranet/include/modules/clsModulesPessoaTransporte.inc.php
@@ -280,15 +280,13 @@ public function lista(
 
         if (is_string($nome_pessoa)) {
             $nm_pessoa = $db->escapeString($nome_pessoa);
-            $filtros .= "
-        {$whereAnd} translate(upper(p.nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_pessoa}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} unaccent(p.nome) ILIKE unaccent('%{$nm_pessoa}%')";
             $whereAnd = ' AND ';
         }
 
         if (is_string($nome_destino)) {
             $nm_destino = $db->escapeString($nome_destino);
-            $filtros .= "
-        {$whereAnd} (translate(upper(pd.nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_destino}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')) OR (translate(upper(pd2.nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nome_destino}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')) ";
+            $filtros .= "{$whereAnd} unaccent(pd.nome) ILIKE unaccent('%{$nm_destino}%') OR unaccent(pd2.nome) ILIKE unaccent('%{$nm_destino}%')";
             $whereAnd = ' AND ';
         }
 

diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarEscola.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarEscola.inc.php
@@ -2473,7 +2473,7 @@ public function lista(
 
         if (is_string($str_nome)) {
             $str_nm = $db->escapeString($str_nome);
-            $filtros .= "{$whereAnd} translate(upper(nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$str_nm}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} unaccent(nome) ILIKE unaccent('%{$str_nm}%')";
             $whereAnd = ' AND ';
         }
 

diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarSerie.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarSerie.inc.php
@@ -464,7 +464,7 @@ public function lista(
 
         if (is_string($str_nm_serie)) {
             $nm_serie = $db->escapeString($str_nm_serie);
-            $filtros[] = "translate(upper(s.nm_serie),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_serie}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros[] = "exists(select nm_serie from pmieducar.serie where unaccent(nm_serie) ILIKE unaccent('%{$nm_serie}%'))";
         }
 
         if (is_numeric($int_etapa_curso)) {

diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php
@@ -692,10 +692,7 @@ public function lista(
         // Busca tipo LIKE pelo nome do servidor
         if (is_string($str_nome_servidor)) {
             $nome_servidor = $db->escapeString($str_nome_servidor);
-            $filtros .= "{$whereAnd} EXISTS (SELECT 1
-  FROM cadastro.pessoa p
-  WHERE cod_servidor = p.idpes
-  AND translate(upper(p.nome),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nome_servidor}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN'))";
+            $filtros .= "{$whereAnd} exists(SELECT * FROM cadastro.pessoa WHERE unaccent(nome) ILIKE unaccent('%{$nome_servidor}%'))";
             $whereAnd = ' AND ';
         }
         // Seleciona apenas servidores que tenham a carga atual maior ou igual ao

diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php
@@ -1234,7 +1234,7 @@ public function lista($int_cod_turma = null, z $int_ref_usuario_exc = null, $int
         }
         if (is_string($str_nm_turma)) {
             $nm_turma = $db->escapeString($str_nm_turma);
-            $filtros .= "{$whereAnd} translate(upper(t.nm_turma),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_turma}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} exists(select nm_turma from pmieducar.turma where unaccent(nm_turma) ILIKE unaccent('%{$nm_turma}%'))";
             $whereAnd = ' AND ';
         }
         if (is_string($str_sgl_turma)) {
@@ -1457,7 +1457,7 @@ public function lista2($int_cod_turma = null, $int_ref_usuario_exc = null, $int_
         }
         if (is_string($str_nm_turma)) {
             $nm_turma = $db->escapeString($str_nm_turma);
-            $filtros .= "{$whereAnd} translate(upper(t.nm_turma),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$nm_turma}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} exists(select nm_turma from pmieducar.turma where unaccent(nm_turma) ILIKE unaccent('%{$nm_turma}%'))";
             $whereAnd = ' AND ';
         }
         if (is_string($str_sgl_turma)) {
@@ -1662,7 +1662,7 @@ public function lista3($int_cod_turma = null, $int_ref_usuario_exc = null, $int_
             $whereAnd = ' AND ';
         }
         if (is_string($str_nm_turma)) {
-            $filtros .= "{$whereAnd} translate(upper(t.nm_turma),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN') LIKE translate(upper('%{$str_nm_turma}%'),'ÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ','AAAAAAEEEEIIIIOOOOOUUUUCYN')";
+            $filtros .= "{$whereAnd} exists(select nm_turma from pmieducar.turma where unaccent(nm_turma) ILIKE unaccent('%{$str_nm_turma}%'))";
             $whereAnd = ' AND ';
         }
         if (is_string($str_sgl_turma)) {