Commit Graph

5320 Commits

Author SHA1 Message Date
Daniel García Aubert
c0e6bf1299 Use ES6 class syntax 2018-05-30 20:08:35 +02:00
Daniel García Aubert
9fe8958e8c Use ES6 class syntax 2018-05-30 20:02:38 +02:00
Daniel García Aubert
7c51895b0f Use const and let instead of var 2018-05-30 19:50:07 +02:00
Daniel García Aubert
16bca85438 Do not use underscore 2018-05-30 19:43:23 +02:00
Daniel García Aubert
9d415d0dbe Extract method to get and build context 2018-05-30 19:30:34 +02:00
Daniel García Aubert
1d0210a372 Reorder code 2018-05-30 19:07:28 +02:00
Daniel García Aubert
2fb6c08702 Remove unnecessary variables 2018-05-30 18:37:11 +02:00
Daniel García Aubert
f7c712f6eb Avoid functions with side effects 2018-05-30 18:31:59 +02:00
Daniel García Aubert
eabd25ee6a Use the returned template instead of the cached one 2018-05-30 18:18:42 +02:00
Daniel García Aubert
5fc49ab3c2 Remove duplicated assignment 2018-05-30 18:16:42 +02:00
Daniel García Aubert
1b6a722c0c Remove step 2018-05-30 18:15:51 +02:00
Daniel García Aubert
5cfffcfa83 Use const instead of var 2018-05-30 17:22:12 +02:00
Daniel García Aubert
4e28f7bb4e Do not require assert and step 2018-05-30 17:10:18 +02:00
Daniel García Aubert
532d50ad7a Return 'null' explicitly 2018-05-30 17:09:01 +02:00
Daniel García Aubert
d8b0d338c0 Use 'const' instead of 'var' 2018-05-30 17:02:15 +02:00
Daniel García Aubert
cd0be5f79d Do not require 'step' 2018-05-30 17:00:55 +02:00
Daniel García Aubert
3820894454 Do not use 'step' 2018-05-30 17:00:15 +02:00
Daniel G. Aubert
12b91e7671
Merge pull request #966 from CartoDB/unify-connection-pool-config
Unify connection pool config
2018-05-30 14:31:39 +02:00
Daniel García Aubert
fe79ee0315 Merge branch 'master' into unify-connection-pool-config 2018-05-29 16:44:21 +02:00
Daniel García Aubert
9c3b3e698e Update yarn.lock 2018-05-29 16:28:23 +02:00
Raúl Marín
ca4eeb332a
Merge pull request #967 from CartoDB/psql_update
Update Windshaft, camshaft and cartodb-psql to use cartodb-psql 0.11.0
2018-05-28 18:07:40 +02:00
Raul Marin
794c3efb7d Update Windshaft, camshaft and cartodb-psql to use cartodb-psql 0.11.0 2018-05-28 17:59:25 +02:00
Javier Goizueta
20fe9c45cf
Merge pull request #968 from CartoDB/sample-columns
Sample columns
2018-05-28 17:51:38 +02:00
Javier Goizueta
26da872704 Leave sample exclude_columns for later 2018-05-28 17:37:45 +02:00
Javier Goizueta
8a1d5d3a48 Be careful and detect type invalid types 2018-05-28 17:36:58 +02:00
Javier Goizueta
0392a2a343
Merge pull request #963 from CartoDB/refactor-metadata
Refactor metadata queryPromise
2018-05-28 17:20:23 +02:00
Javier Goizueta
34a2f3b32b Tests were missing in previous commit 2018-05-28 16:50:53 +02:00
Javier Goizueta
4bb8914d9a Add parameters to select metadata sample columns 2018-05-28 16:08:31 +02:00
Javier Goizueta
f7c80a0101 Merge branch 'master' into refactor-metadata 2018-05-28 10:49:58 +02:00
Daniel García Aubert
2d417b4a37 Merge branch 'master' into unify-connection-pool-config 2018-05-28 10:47:02 +02:00
Daniel García Aubert
46bb400ffd Cast x-windshaft-cache header in order to fix assertions 2018-05-28 10:46:04 +02:00
Daniel García Aubert
8b05d75f97 Revert test runner filters 2018-05-28 10:32:31 +02:00
Daniel García Aubert
4861d35628 Cast to integer before comparing cache headers 2018-05-28 10:31:48 +02:00
Daniel García Aubert
4a8bfcf647 Revert this commit: try to see what's happening here 2018-05-28 10:03:07 +02:00
Daniel García Aubert
b311f0e091 Add generic pool configuration to postgres global config 2018-05-25 18:38:31 +02:00
Daniel García Aubert
4e4399b727 Missing postgis configuration 2018-05-25 18:00:53 +02:00
Daniel García Aubert
bbab9c1a6b Avoid breaking changes 2018-05-25 14:44:58 +02:00
Daniel García Aubert
5938836ff5 Use default postgres port 2018-05-25 14:36:06 +02:00
Daniel García Aubert
d003790e4d Use the right port again 2018-05-25 14:25:43 +02:00
Daniel García Aubert
1d0fa9a5f6 Use the right port 2018-05-25 14:23:19 +02:00
Daniel García Aubert
8fe192267d cosmetic 2018-05-25 13:37:57 +02:00
Daniel García Aubert
92255797d9 Add torque options to renderer factory 2018-05-25 13:37:34 +02:00
Daniel García Aubert
f404285140 Use postgres pool configuration to have the same configuration for all renderers. 2018-05-24 18:36:45 +02:00
Daniel García Aubert
ee38c717a5 Remove geojson renderer config 2018-05-24 18:11:18 +02:00
Daniel García Aubert
1668392296 Move 'postgres' attributes inside Mapnik's renderer configuration and keep params relative to user's connection 2018-05-24 13:42:32 +02:00
Javier Goizueta
c1feaecbcb Merge branch 'master' into refactor-metadata
# Conflicts:
#	lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
2018-05-23 12:12:36 +02:00
Javier Goizueta
dea1c74fcc
Merge pull request #964 from CartoDB/metadata-categories
Add metadata parameter for NULL categories
2018-05-23 12:08:26 +02:00
Javier Goizueta
22a0f2c14e Merge branch 'master' into metadata-categories 2018-05-23 11:17:10 +02:00
Javier Goizueta
94c34eeb23 Small change to use const 2018-05-23 11:15:20 +02:00
Daniel G. Aubert
d63d976916
Merge pull request #965 from CartoDB/fix-random-failures-test
Fix random failures test
2018-05-22 20:11:27 +02:00