Commit Graph

394 Commits

Author SHA1 Message Date
Raul Ochoa
3a3c49e40d Stubs next version 2016-05-24 17:22:46 +02:00
Daniel García Aubert
caa07e0968 Stubs next version 2016-05-24 12:41:09 +02:00
Daniel García Aubert
2724133591 Release 1.29.0 2016-05-24 12:38:30 +02:00
Daniel García Aubert
052cb0796d Modified fallback tests in order to use our custom assert.response 2016-05-20 14:42:53 +02:00
Daniel García Aubert
b94a9c7c0a Fixed conflicts 2016-05-18 11:48:39 +02:00
Daniel
8c8da8e39c Merge pull request #301 from CartoDB/job-model-refactor
Job model refactor
2016-05-18 11:38:41 +02:00
Daniel García Aubert
8b7d481b9a Avoided console usage, favor debug 2016-05-18 11:06:49 +02:00
Daniel García Aubert
b2eac6b880 Implemented test for fallback jobs 2016-05-17 01:00:27 +02:00
Raul Ochoa
06aa11aa4d Stubs next version 2016-05-12 17:37:33 +02:00
Raul Ochoa
29287e0cd6 Stubs next version 2016-05-11 11:46:53 +02:00
Daniel García Aubert
d859311da2 Added tasks for npm in order to run unit test in watch mode 2016-05-06 18:15:22 +02:00
Daniel García Aubert
c2a4036fe4 Revert "Added npm's tasks in order to run unit test in watch mode"
This reverts commit d4206a70d8.
2016-05-06 18:14:03 +02:00
Daniel García Aubert
d4206a70d8 Added npm's tasks in order to run unit test in watch mode 2016-05-06 18:12:13 +02:00
Raul Ochoa
e1888c9936 Upgrades step-profiler to 0.3.0 to avoid dots in json keys
Closes #294
2016-05-05 14:01:36 +02:00
Daniel García Aubert
73e6c56e6d Stubs next version 2016-04-18 17:02:11 +02:00
Daniel García Aubert
8d67faad59 Stubs next version 2016-04-05 16:17:03 +02:00
Daniel García Aubert
c103d315af Release 1.27.0 2016-04-05 16:06:16 +02:00
Alejandro Martínez
ffb1afb962 Release 1.26.0 2016-03-08 16:17:35 +01:00
Alejandro Martínez
613cdeffdd Rename node-cartodb-query-tables to cartodb-query-tables 2016-02-22 19:08:29 +01:00
Alejandro Martínez
5e06711b4b Use node-cartodb-querytables library 2016-02-22 12:24:05 +01:00
Raul Ochoa
028e0d1553 Add a valid SPDX license expression 2016-02-04 15:23:34 +01:00
Raul Ochoa
355c28fa77 Stubs next version 2016-02-02 01:30:12 +01:00
Raul Ochoa
8130d1fc6d Stubs next version 2016-02-01 17:59:12 +01:00
Raul Ochoa
9b0a3b190c Fix async-queue version and regenerate npm-shrinkwrap.json 2016-01-28 16:43:00 +01:00
Daniel García Aubert
e1e6a56277 Merge branch 'master' of github.com:CartoDB/CartoDB-SQL-API 2016-01-28 16:33:10 +01:00
Daniel García Aubert
a68d32e0ab Removed unused module in dev dependencies in package.json 2016-01-28 16:32:08 +01:00
Raul Ochoa
1b4f2ac7f3 Stubs next version 2016-01-28 16:19:10 +01:00
Daniel García Aubert
0e14251615 Stubs next version 2016-01-26 14:35:02 +01:00
Daniel García Aubert
2da35ac968 Merge branch 'master' of github.com:CartoDB/CartoDB-SQL-API into batch-api 2016-01-22 13:09:20 +01:00
Raul Ochoa
c096d843a2 Adds coverage tool 2016-01-22 12:18:20 +01:00
Daniel García Aubert
d11b4608aa Back to tabs with 4 spaces again 2015-12-23 17:32:57 +01:00
Daniel García Aubert
b16c0983c6 Implemented tests for batch API 2015-12-22 23:13:33 +01:00
Daniel García Aubert
3762ad7a39 Now jobs are stored in redis instead of user's database 2015-12-21 19:57:10 +01:00
Daniel García Aubert
43f759e96a Refactored Batch API using streams instead a interval to consume the job queue. Limited one job running at the same time per queue instead of using a job's counter to limit it. 2015-12-16 15:57:58 +01:00
Daniel García Aubert
0c6edc573a Used cartodb-redis instead redis-mpool 2015-12-09 12:18:33 +01:00
Daniel García Aubert
00721bcd02 Implementing batch service 2015-12-09 00:02:08 +01:00
Raul Ochoa
f816093036 Set Last-Modified header based on affected tables
Closes #101
2015-09-02 16:25:56 +02:00
Raul Ochoa
9b5a729a41 Stubs next version 2015-08-04 16:33:36 +02:00
Raul Ochoa
7c696317d0 New option to remove client from pool after error happens
This help to avoid issues with transactions.

Closes #241
2015-08-04 15:53:50 +02:00
Raul Ochoa
bb2cf83ff6 Upgrades cartodb-psql to 0.6.0 2015-08-04 15:35:31 +02:00
Raul Ochoa
283572c535 Stubs next version 2015-06-16 17:36:26 +02:00
Raul Ochoa
afdb385fcf Bumps versions for new SpatiaLite feature 2015-06-16 17:19:57 +02:00
Raul Ochoa
e9dda12ad3 Adds tests for big results in ogr formats 2015-06-16 15:54:13 +02:00
Francisco Dans
6e9eb9f43f adds sqlite3 as dev dep 2015-06-01 13:21:17 +02:00
Raul Ochoa
d052850cc9 Stubs next version 2015-05-26 10:19:47 +02:00
Raul Ochoa
db03235c4a Stubs next version 2015-05-14 13:18:58 +02:00
Raul Ochoa
513a4e747b Make jshint part of npm test 2015-05-13 13:13:16 +02:00
Raul Ochoa
b6f71eb180 Makefile with testing targets 2015-05-12 18:33:57 +02:00
Raul Ochoa
99390eb0ab Adds jshint dev dep and jshintrc config file 2015-05-12 17:31:30 +02:00
Raul Ochoa
36c498c0a2 Stubs next version 2015-04-09 10:50:30 +02:00
Raul Ochoa
269868ccd0 Update news and bumps version for new features 2015-04-09 10:45:03 +02:00
Raul Ochoa
6d413f9595 Stubs next version 2015-03-02 14:35:59 +01:00
Raul Ochoa
c590759302 Stubs next version 2015-03-02 12:57:16 +01:00
Raul Ochoa
83299bce6c Update news 2015-03-02 12:49:25 +01:00
Raul Ochoa
2cf43dc754 Stubs next version 2015-02-26 16:30:07 +01:00
Raul Ochoa
05c13a3f17 Bump version due to new keep-alive and max size per row options 2015-02-26 16:12:59 +01:00
Raul Ochoa
8897c7d0ad Upgrades cartodb-psql to 0.5.1 2015-02-20 15:01:07 +01:00
Raul Ochoa
7610658ac7 Upgrades cartodb-psql to 0.5.0 2015-02-19 14:54:49 +01:00
Raul Ochoa
192ea15443 Stubs next version 2014-12-15 16:26:41 +01:00
Raul Ochoa
256b82b1d8 Closes fd for log files on kill -HUP. Fixes #187 2014-12-02 12:25:25 +01:00
Raul Ochoa
a7418fe721 Stubs next version 2014-11-21 13:45:55 +01:00
Raul Ochoa
d50ddbb10f Add more fields to error responses with hint, detail and context for SQL errors. 2014-11-21 12:59:48 +01:00
Raul Ochoa
747b75df88 Stubs next version 2014-10-14 15:39:25 +02:00
Raul Ochoa
16b53cba83 Release 1.18.0 2014-10-14 15:17:05 +02:00
Raul Ochoa
1da0181261 Upgrades mocha testing framework dependency 2014-09-26 17:21:36 +02:00
Raul Ochoa
3c57adb739 Stubs next version 2014-09-23 12:41:38 +02:00
Raul Ochoa
b6da70fba1 Stubs next version 2014-09-17 00:04:10 +02:00
Raul Ochoa
7eed096b16 Release 1.17.0 2014-09-17 00:01:09 +02:00
Raul Ochoa
f8d2826ddd Upgrades cartodb-redis and re-generates npm-shrinkwrap.json 2014-09-16 23:58:06 +02:00
Raul Ochoa
2d811408c0 Upgrades dependencies 2014-08-20 12:34:01 +02:00
Raul Ochoa
b87eafe58f Stubs next version 2014-08-19 14:44:04 +02:00
Raul Ochoa
f4a6e63fe1 Stubs next version 2014-08-18 16:05:49 +02:00
Raul Ochoa
da37d7092f Uses https endpoints for dependencies 2014-08-14 14:25:43 +02:00
Raul Ochoa
2fc16ce2c5 Updates news 2014-08-14 14:23:41 +02:00
Raul Ochoa
0aa1b0e2e9 Merge branch 'master' into upgrade-dependencies
Conflicts:
	app/models/psql.js
	npm-shrinkwrap.json
	package.json
2014-08-14 14:19:20 +02:00
Raul Ochoa
109ac36610 Upgrades cartodb-redis 2014-08-14 13:18:52 +02:00
Raul Ochoa
99a36bc229 Removes pg dependency as now it's behind cartodb-psql 2014-08-14 13:03:19 +02:00
Raul Ochoa
77cb86154c Starts using cartodb-psql node module in SQL API 2014-08-11 20:15:55 +02:00
Raul Ochoa
99fe4d904b Upgrades dependencies except express 2014-08-11 17:33:42 +02:00
Raul Ochoa
14d5323a0b Stubs next version 2014-08-08 12:53:25 +02:00
Raul Ochoa
21b8e6947c Non authenticated request cannot use pg_ catalogs/functions 2014-08-08 12:48:29 +02:00
Raul Ochoa
9cc7c94406 Stubs next version 2014-08-07 16:47:25 +02:00
Raul Ochoa
351384389c Stubs next version 2014-08-07 15:20:39 +02:00
Raul Ochoa
bd60f8f748 Using new method from cartodb-redis to retrieve oauth values so we
can reuse the same redis-mpool
2014-08-06 12:51:55 +02:00
Raul Ochoa
81e191bcf3 Fixes redis-mpool dependency 2014-08-06 11:32:12 +02:00
Raul Ochoa
480a9f27b4 New authentication mechanism: checks in advance if credentials are provided
in order to do a single request to redis to retrieve the required database
connection parameters.
2014-08-05 16:20:06 +02:00
Raul Ochoa
e16f278087 CDB-3629 Uses one request to redis to retrieve all connection params 2014-08-05 02:29:07 +02:00
Raul Ochoa
04dd9c709b Stubs next version 2014-08-05 01:03:56 +02:00
Raul Ochoa
78c5bcde21 Stubs next version 2014-08-04 14:51:54 +02:00
Raul Ochoa
8a4a08fb54 Release 1.12.0 2014-08-04 14:51:01 +02:00
Raul Ochoa
cad38f4ab4 Stubs next version 2014-07-30 12:16:07 +02:00
Raul Ochoa
3cdd5630a6 Release 1.11.0 2014-07-30 12:15:12 +02:00
Raul Ochoa
2653314818 CDB-3657 Sends profiler data as json in X-SQLAPI-Profiler header 2014-07-29 19:29:16 +02:00
Raul Ochoa
a7d444ca92 Changes authentication to start using public user if it is defined in redis. 2014-07-29 13:52:04 +02:00
Raul Ochoa
e8eded48ce Prepares for 1.10.2 2014-06-05 17:04:12 +02:00
Raul Ochoa
55dcb50809 Prepares for 1.10.1 2014-06-04 15:44:13 +02:00
Raul Ochoa
ff70d8bcf9 Adds sql unit tests directory for sql_wrapper to npm package. 2014-04-15 14:57:38 +02:00
Sandro Santilli
68aa854477 Prepare for 1.10.0 2014-03-20 17:11:56 +01:00
Sandro Santilli
766345595e Add statsd support
Closes #133
2014-03-20 11:22:13 +01:00
Sandro Santilli
653621a8c8 Remove unneeded node-uuid dependency 2014-03-20 09:52:03 +01:00
Sandro Santilli
2cbdc4c38c Add profiler support
Closes #142
2014-03-19 18:34:21 +01:00
Sandro Santilli
f88d33fdb9 Fix lack of response on backend crash
Closes #135
Enables previously failing test
Required upgrade of node-postgresql to own fork
2014-03-19 10:43:39 +01:00
Sandro Santilli
29002bb311 Upgrade zipfile and libxmljs dependencies
Gets closer to node-0.10 compatibility (#132)
2014-03-17 13:42:35 +01:00
Sandro Santilli
65f31fd7c1 Add optional support for rollbar
Closes #150
Logs messages of severity ERROR or higher
2014-03-13 12:09:39 +01:00
Sandro Santilli
1f3aca837b Use log4js for logging
Closes #136
2014-03-13 11:52:40 +01:00
Sandro Santilli
c4fc010d9b Remove duplicated dependency 2014-03-13 11:11:29 +01:00
Sandro Santilli
b453671f63 Prepare for 1.9.0 2014-02-10 17:23:42 +01:00
Sandro Santilli
5c6eef527f Prepare for 1.8.3 2014-01-20 12:39:29 +01:00
Sandro Santilli
b8b521581a Prepare for 1.8.2 2014-01-10 11:32:48 +01:00
Sandro Santilli
f7f4fa3209 Prepare for 1.8.1 2013-12-18 12:38:10 +01:00
Sandro Santilli
87d35aa155 Generalize CartoDB username extraction, allowing for multiuser setups
Closes #124
2013-12-18 11:59:00 +01:00
Sandro Santilli
46bc0eb369 Target 1.8.0 2013-12-18 10:29:26 +01:00
Sandro Santilli
fa4703ccee Prepare for 1.7.2 2013-12-02 11:59:28 +01:00
Sandro Santilli
7db4cbcb0f Add package keywords 2013-11-28 11:17:33 +01:00
Sandro Santilli
59c1907ed4 Update mocha to ~0.14.0 2013-11-27 12:58:36 +01:00
Sandro Santilli
22fba12dca Prepare for 1.7.1 2013-11-19 12:14:19 +01:00
Sandro Santilli
03ea51a375 CartoDB redis interaction delegated to "cartodb-redis" module 2013-11-15 19:14:55 +01:00
Sandro Santilli
1e9d073cd4 Retarget to 1.7.0 2013-11-15 12:15:06 +01:00
Sandro Santilli
d21e5b7e69 Prepare for 1.6.4 2013-11-10 21:39:23 +01:00
Sandro Santilli
7cbb004312 Prepare for 1.6.3 2013-11-07 17:54:42 +01:00
Sandro Santilli
0cea623e41 Prepare for 1.6.2 2013-11-05 17:59:17 +01:00
Sandro Santilli
019277302d Prepare for 1.6.1 2013-10-02 13:14:32 +02:00
Sandro Santilli
3b69a7f808 Drop support for cluster 2013-10-02 12:45:06 +02:00
Sandro Santilli
82f965fa57 Upgrade node-pg dependency to 2.6.2
Simplifies PSQL.quoteIdentifier and exposes PSQL.quoteLiteral
2013-10-02 12:32:24 +02:00
Luis Bosque
f30837298e Target v1.6.0 2013-09-06 11:26:08 +02:00
Sandro Santilli
a6905d114c Fix author/contributors, add repository 2013-07-19 12:37:09 +02:00
Luis Bosque
62b420c1e8 Target v1.5.3 2013-07-10 07:59:13 +02:00
Luis Bosque
b82c390c2f Target v1.5.2 2013-07-09 10:47:42 +02:00
Luis Bosque
bd927556c5 Target v1.5.1 2013-07-05 15:31:21 +02:00
Sandro Santilli
298027aa5d Further upgrade node-postgresql to 1.2.0, for field types availability 2013-06-06 17:47:23 +02:00
Sandro Santilli
e03262c5da Upgrade node-postgresql to ~1.1.3 fixing evented query model 2013-06-06 17:06:06 +02:00
Sandro Santilli
1f26d31ac4 Update NEWS, and target 1.5.0
Let's leave 1.4.x for hotfixes
2013-05-29 12:44:04 +02:00
Luis Bosque
9475e6ef0a Target v1.4.1 2013-05-28 18:15:15 +02:00
javi
0be9e47930 Add arraybuffer format 2013-05-28 10:37:39 +02:00
Sandro Santilli
b1e7bb8f8f Upgrade underscore dependencies 2013-05-24 08:26:23 +02:00
Luis Bosque
b16c5bb034 Target v1.3.10 2013-05-10 12:18:27 +02:00
Fabio Rueda
fc6aed2e9e targeted 1.3.9 2013-04-15 14:04:55 +02:00
Luis Bosque
bc068a5463 Merge branch 'release/staging' into develop 2013-04-04 14:25:43 +02:00
Sandro Santilli
2d311d31e4 Fix "Unsupported startup parameter: options" bug 2013-04-03 12:06:43 +02:00
Luis Bosque
aa5e3bcd36 Target v1.3.8 2013-04-02 11:39:54 +02:00
Sandro Santilli
b548cd5e35 Use wildcards to find testcases 2013-03-27 17:28:34 +01:00
Sandro Santilli
0261e8f687 Drop unused dependencies (csv and strftime) 2013-03-27 15:55:57 +01:00
Sandro Santilli
6c0d7813f6 Upgrade generic-pool to ~2.0.2 2013-03-14 11:58:30 +01:00
Sandro Santilli
5fa19a0515 Fix parsing of numeric arrays. Closes #88.
Includes testcase, requires using a fork of node-postgresql.
2013-03-14 11:41:07 +01:00
Luis Bosque
c5b2534687 Target v1.3.7 2013-02-28 15:03:42 +01:00
David Arango
a077afb331 Bump version to 1.3.6 2013-02-19 12:40:58 +01:00
Sandro Santilli
d77720e132 Revert "Updagres pg module"
This reverts commit d418db03e4.

The problem we were after was elsewhere.
Upgrading pg module may still be a good thing but needs to be
done togheter with generic-pool and also needs updates to
shrinkwrap file
2013-02-18 16:25:37 +01:00
David Arango
d418db03e4 Updagres pg module 2013-02-18 13:09:44 +01:00
Sandro Santilli
19eb51b06d Use an LRU cache for query tables, and add expiration support
Defaults to 8192 items each valid for no more than 10 minutes
Both settings can be changed via environment config.
See #83
2013-02-13 18:59:09 +01:00
Sandro Santilli
197c14f30f Add test focused on x-cache-channel handling 2013-02-13 17:31:53 +01:00
David Arango
938a87cfe0 Bump to 1.3.5 2013-01-21 18:01:16 +01:00
Sandro Santilli
19fc0e5854 Fix crash when issuing SQL "COPY" command
This involved upgrade of node-postgresql module.
See https://github.com/brianc/node-postgres/issues/242
2013-01-17 10:14:29 +01:00
David Arango
f387903912 Bump to 1.3.4 2013-01-11 13:57:47 +01:00
Sandro Santilli
9550837fbe Split CSV tests from main test file 2013-01-11 11:21:59 +01:00
Sandro Santilli
39669578b6 Initial support for TopoJSON (#79)
Does not include any attributes in the format
2013-01-09 17:43:23 +01:00
Sandro Santilli
050e1c8e05 Use own fork of pg module for correct timestamptz parsing
See https://github.com/brianc/node-postgres/pull/226
Closes #77
2012-12-07 17:08:56 +01:00
Sandro Santilli
2e85588d99 Format date fields in CSV output 2012-12-07 14:27:02 +01:00
Sandro Santilli
38e750e46d Improve test runner: allow skipping preparation and specify testfiles
Call run_tests.sh with no args to get an help screen
2012-12-07 11:35:37 +01:00
Luis Bosque
3b9dc554f9 Target version 1.3.3 2012-11-28 16:45:49 +01:00
Sandro Santilli
c00cf6d390 Revert "Upgrade node-csv module to version 0.2.4"
This reverts commit 270e6280ed.
The performance issue must be fixed before we can upgrade:
https://github.com/wdavidw/node-csv-parser/issues/64
2012-11-19 18:44:53 +01:00
Sandro Santilli
270e6280ed Upgrade node-csv module to version 0.2.4
Will help with compressed-csv export format
2012-11-19 16:20:40 +01:00
Luis Bosque
e20c14e222 target v1.3.2 2012-11-14 18:24:26 +01:00
Luis Bosque
1914ab9196 target v1.3.1 2012-11-13 11:42:18 +01:00
Sandro Santilli
005ae48e3a Support for specifying a list of fields to skip from output.
Closes #63
2012-11-12 17:11:17 +01:00
Luis Bosque
ab9c739995 removed -dev suffix from package.json version 2012-11-12 13:23:34 +01:00
Sandro Santilli
46cec7a0e5 Add support for specifying a filename for exports. Closes #64
Sets release target to 1.3.0, due to parameter addition
2012-11-12 12:40:53 +01:00
Luis Bosque
755fe738ca target v1.2.2 2012-11-12 12:27:37 +01:00
Luis Bosque
62b22bb9f3 target version 1.2.1 2012-11-02 15:38:24 +01:00
Sandro Santilli
765dc101b0 Target 1.2.0, due to addition of new features since 1.1.0
NOTE: I haven't touched npm-shrinkwrap.json as that file will
      get version from package.json on next regeneration

NOTE2: I added -dev suffix to the version so you can tell if
       you're running a development version or the "official"
       release (will get -dev removed)
2012-10-31 12:13:12 +01:00
Luis Bosque
4e0346a5a1 target version 1.1.1 2012-10-30 18:56:11 +01:00
Sandro Santilli
7fe09935cd Restrict listening host to configured `node_host` 2012-10-09 18:41:23 +02:00
Sandro Santilli
954e54c87d Prepare for 1.1.0 2012-10-04 12:04:49 +02:00
Luis Bosque
4ec9bf34c1 fixed problem in cluster2 with pidfile name 2012-10-04 10:54:09 +02:00
Luis Bosque
686ff617b8 updated version to 1.0.0 2012-10-03 16:53:17 +02:00
Sandro Santilli
e94b06e10c Switch to cluster2 for node-0.8 support 2012-09-28 13:19:28 +02:00
Sandro Santilli
2549560c58 Encode version in package.json -- now targetting 0.9.1-dev 2012-09-19 09:41:53 +02:00
Sandro Santilli
2ae5119bae Raise express dependency to 2.5.11 where it also work with node-0.8
This version passed "make check" with:
 - node 0.4.10
 - node 0.6.19
 - node 0.8.2
2012-07-16 19:10:50 +02:00
Sandro Santilli
7f8ab22c56 Require "zlib":"1.0.5", which would be needed by node-0.4 2012-07-16 19:03:22 +02:00
Sandro Santilli
e4f3a94256 Port tests to mocha. Closes #35. 2012-07-13 10:29:09 +02:00
Sandro Santilli
debc0c2586 Run tests on "make check", using custom port for redis
Includes tweaks in the db preparation script and in the tests
for proper handling of async model. Only a single test is run
at the moment, being the only one that succeeded for me.
2012-07-12 18:10:56 +02:00
Simon Tokumine
0ae158ccf6 bump version 2012-04-13 16:59:41 +01:00
Simon Tokumine
4cbdf62cc2 make wellformed CSV and stream back to browser. #9 2012-04-13 15:37:09 +01:00
Simon Tokumine
2f87b54101 bump version 2012-04-13 00:32:51 +01:00
Simon Tokumine
80d5b6f894 bump version 2012-04-10 12:57:13 +01:00
Simon Tokumine
dd9de25616 node v0.6 compatibility 2012-03-16 13:50:07 +01:00
Simon Tokumine
b8e17d6b57 update readme and bump node deps to allow 0.6 2012-03-16 11:46:34 +01:00
Simon Tokumine
555e072195 tidy geojson, add content-disposition and remove KML for now. Closes #7 2011-10-28 12:11:18 +01:00
Simon Tokumine
eba7eb4e28 quick tidy 2011-10-07 17:28:07 +01:00
Andrew W. Hill
19b2829d73 added simple kml support to SQL API, format=kml will output 2011-09-20 19:15:43 -07:00
Simon Tokumine
5064ded0e7 upgraded pg package. tests updated 2011-09-07 15:33:40 +01:00
Simon Tokumine
b12df70030 revert changes to config - sorry andrew 2011-09-07 12:10:16 +01:00
Andrew W Hill
622d5658f1 had to set an explicit -socket path- in cluster.js to work on dev VM, set to /tmp 2011-09-05 17:51:15 -04:00
Simon Tokumine
fefa051450 added true oauth to application. got rid of bogus 2011-08-17 17:27:45 +01:00
Simon Tokumine
995fb705f4 added npm package file for dependencies 2011-06-30 12:13:39 +01:00