diff --git a/src/libs/routes/idhm.js b/src/libs/routes/idhm.js index 838e20bde4697f74a23b55d0ee04958b2de4006e..d8d013faac029449627c1f4645565f9d9f4c9037 100644 --- a/src/libs/routes/idhm.js +++ b/src/libs/routes/idhm.js @@ -28,13 +28,13 @@ idhmApp.get('/year_range', (req, res, next) => { req.sql.from('adh_idh') .field('MIN(adh_idh.ano_censo)', 'start_year') .field('MAX(adh_idh.ano_censo)', 'end_year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.sql.from('adh_idh_uf') .field('MIN(adh_idh_uf.ano_censo)', 'start_year') .field('MAX(adh_idh_uf.ano_censo)', 'end_year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); req.old_result = req.result; next(); }, query, (req, res, next) => { @@ -52,7 +52,7 @@ idhmApp.get('/year_range', (req, res, next) => { idhmApp.get('/years', (req, res, next) => { req.sql.from('adh_idh') .field('DISTINCT adh_idh.ano_censo', 'year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.oldResult = req.result; @@ -61,7 +61,7 @@ idhmApp.get('/years', (req, res, next) => { req.sql.from('adh_idh_uf') .field('DISTINCT adh_idh_uf.ano_censo', 'year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); next(); }, query, (req, res, next) => { let result = Object.assign(req.oldResult, req.result); diff --git a/src/libs/routes/idhme.js b/src/libs/routes/idhme.js index ec6c2df40a348b39bcf8c1b577de9bbffe7688db..e061a2a171caadb23b2371c6a80c3e647193203a 100644 --- a/src/libs/routes/idhme.js +++ b/src/libs/routes/idhme.js @@ -26,13 +26,13 @@ idhmeApp.get('/year_range', (req, res, next) => { req.sql.from('adh_idh') .field('MIN(adh_idh.ano_censo)', 'start_year') .field('MAX(adh_idh.ano_censo)', 'end_year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.sql.from('adh_idh_uf') .field('MIN(adh_idh_uf.ano_censo)', 'start_year') .field('MAX(adh_idh_uf.ano_censo)', 'end_year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); req.old_result = req.result; next(); }, query, (req, res, next) => { @@ -50,7 +50,7 @@ idhmeApp.get('/year_range', (req, res, next) => { idhmeApp.get('/years', (req, res, next) => { req.sql.from('adh_idh') .field('DISTINCT adh_idh.ano_censo', 'year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.oldResult = req.result; @@ -59,7 +59,7 @@ idhmeApp.get('/years', (req, res, next) => { req.sql.from('adh_idh_uf') .field('DISTINCT adh_idh_uf.ano_censo', 'year') - .where('adh_idh_uf.ano_censo > 2014');; + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); next(); }, query, (req, res, next) => { let result = Object.assign(req.oldResult, req.result); diff --git a/src/libs/routes/idhml.js b/src/libs/routes/idhml.js index 093bb7505b6fc0800f22880d140d99e61bb512a1..dba2ccc97c809e2caa5eac612d7d6fc99efed23e 100644 --- a/src/libs/routes/idhml.js +++ b/src/libs/routes/idhml.js @@ -26,13 +26,13 @@ idhmlApp.get('/year_range', (req, res, next) => { req.sql.from('adh_idh') .field('MIN(adh_idh.ano_censo)', 'start_year') .field('MAX(adh_idh.ano_censo)', 'end_year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.sql.from('adh_idh_uf') .field('MIN(adh_idh_uf.ano_censo)', 'start_year') .field('MAX(adh_idh_uf.ano_censo)', 'end_year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); req.old_result = req.result; next(); }, query, (req, res, next) => { @@ -50,7 +50,7 @@ idhmlApp.get('/year_range', (req, res, next) => { idhmlApp.get('/years', (req, res, next) => { req.sql.from('adh_idh') .field('DISTINCT adh_idh.ano_censo', 'year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.oldResult = req.result; @@ -59,7 +59,7 @@ idhmlApp.get('/years', (req, res, next) => { req.sql.from('adh_idh_uf') .field('DISTINCT adh_idh_uf.ano_censo', 'year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); next(); }, query, (req, res, next) => { let result = Object.assign(req.oldResult, req.result); diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js index e565b92c5a1632b8dc7992267a04d963ba666db5..9a8bcf7b962118c68326ceee0ccff151bbd67117 100644 --- a/src/libs/routes/idhmr.js +++ b/src/libs/routes/idhmr.js @@ -28,13 +28,13 @@ idhmrApp.get('/year_range', (req, res, next) => { req.sql.from('adh_idh') .field('MIN(adh_idh.ano_censo)', 'start_year') .field('MAX(adh_idh.ano_censo)', 'end_year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.sql.from('adh_idh_uf') .field('MIN(adh_idh_uf.ano_censo)', 'start_year') .field('MAX(adh_idh_uf.ano_censo)', 'end_year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); req.old_result = req.result; next(); }, query, (req, res, next) => { @@ -52,7 +52,7 @@ idhmrApp.get('/year_range', (req, res, next) => { idhmrApp.get('/years', (req, res, next) => { req.sql.from('adh_idh') .field('DISTINCT adh_idh.ano_censo', 'year') - .where('adh_idh.ano_censo > 2014'); + .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013'); next(); }, query, (req, res, next) => { req.oldResult = req.result; @@ -61,7 +61,7 @@ idhmrApp.get('/years', (req, res, next) => { req.sql.from('adh_idh_uf') .field('DISTINCT adh_idh_uf.ano_censo', 'year') - .where('adh_idh_uf.ano_censo > 2014'); + .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013'); next(); }, query, (req, res, next) => { let result = Object.assign(req.oldResult, req.result); diff --git a/src/libs/routes/pibpercapita.js b/src/libs/routes/pibpercapita.js index a6078c3ae4f03dbcabf5a0ce275e7a01925fcbfb..83d914a3b1128c9761a34720b81bdb323d923380 100644 --- a/src/libs/routes/pibpercapita.js +++ b/src/libs/routes/pibpercapita.js @@ -28,14 +28,14 @@ pibpercapitaApp.get('/year_range', (req, res, next) => { req.sql.from('ibge_pib') .field('MIN(ibge_pib.ano_censo)', 'start_year') .field('MAX(ibge_pib.ano_censo)', 'end_year') - .where('ibge_pib.ano_censo > 2014'); + .where('ibge_pib.ano_censo <> 2014 AND ibge_pib.ano_censo <> 2013'); next(); }, query, response('range')); pibpercapitaApp.get('/years', (req, res, next) => { req.sql.from('ibge_pib'). field('DISTINCT ibge_pib.ano_censo', 'year') - .where('ibge_pib.ano_censo > 2014'); + .where('ibge_pib.ano_censo <> 2014 AND ibge_pib.ano_censo <> 2013'); next(); }, query, response('years')); diff --git a/src/libs/routes/population.js b/src/libs/routes/population.js index 14b3ba0a39162be0c7b2ce473b3a34809ab1c0fc..1d582c5563225082c488328f6644e824202df3e3 100644 --- a/src/libs/routes/population.js +++ b/src/libs/routes/population.js @@ -28,14 +28,14 @@ populationApp.get('/year_range', (req, res, next) => { req.sql.from('ibge_populacao') .field('MIN(ibge_populacao.ano_censo)', 'start_year') .field('MAX(ibge_populacao.ano_censo)', 'end_year') - .where('ibge_populacao.ano_censo > 2014'); + .where('ibge_populacao.ano_censo <> 2014 AND ibge_populacao.ano_censo <> 2013'); next(); }, query, response('range')); populationApp.get('/years', (req, res, next) => { req.sql.from('ibge_populacao'). field('DISTINCT ibge_populacao.ano_censo', 'year') - .where('ibge_populacao.ano_censo > 2014'); + .where('ibge_populacao.ano_censo <> 2014 AND ibge_populacao.ano_censo <> 2013'); next(); }, query, response('years'));