1
0
Fork 0
Commit Graph

441 Commits

Author SHA1 Message Date
Frank Celler 5de6c354a9 added warning, removed local-configuration, bumped version 2016-02-18 14:02:40 +01:00
Frank Celler 60305868a8 added grace period 2016-02-18 12:12:29 +01:00
Frank Celler f0c849d93a increased wait 2016-02-15 21:39:59 +01:00
Frank Celler 0f88ade568 raised sleep 2016-02-13 21:36:51 +01:00
Frank Celler 5b86bd1cdc use higher timeout 2016-02-11 13:50:56 +01:00
Wilfried Goesgens 3b12dc0c32 Remove httparty from the bundle - it comes as a dependency from persistent_httparty 2016-02-10 10:48:03 +01:00
Wilfried Goesgens 88fad2e789 Migrate rspec to persistent connections 2016-02-10 10:36:52 +01:00
Wilfried Goesgens d7f42972b0 Raise required rspec version to 2.14 for json output formatters. 2016-01-26 12:48:22 +01:00
Wilfried Goesgens 301749e48f fix test 2016-01-25 17:15:12 +01:00
Wilfried Goesgens f8738808b7 Add missing dependency to rspec-core. 2016-01-25 16:31:34 +01:00
jsteemann 67147482ce bumped built-in version number from 2.7.0-devel to 2.8 2016-01-08 01:56:23 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
jsteemann 2118dc6101 fixed typo 2015-12-21 01:42:48 +01:00
jsteemann 20ed092d11 added `--create-collection-type` option for arangoimp 2015-12-18 22:26:32 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Max Neunhoeffer 107ef90916 Improve logging of unittests. 2015-12-11 13:23:26 +01:00
Wilfried Goesgens 17c479fe25 Increase timeout, so we can see cluster internal timeouts and their error messages. 2015-12-07 15:56:48 +01:00
Alan Plum 7538d71333 URL parameter -> {query,path} parameter 2015-11-24 18:09:43 +01:00
Jan Steemann 1bf5abaf14 changed HTTP return code for canceled operations from 408 to 410 2015-11-23 10:25:05 +01:00
Jan Steemann e321c9747a added option `--server.hide-product-header` 2015-11-10 10:27:59 +01:00
Wilfried Goesgens 2c38e2a78d make redirects relative if on the same host; later editions of the HTTP 1.1 RFC state that its valid.
this fixes #1558
2015-11-04 13:32:34 +01:00
Jan Steemann 53d2787cf6 added test case for routing and binary req/res 2015-10-08 10:18:36 +02:00
jsteemann 9e6223756a attempt to fix test that fails non-deterministically on TravisCI 2015-09-17 21:07:48 +02:00
jsteemann 22e17814e3 additionally allow the following characters in document keys:
`(` `)` `+` `,` `=` `;` `$` `!` `*` `'` `%`
2015-09-15 00:16:08 +02:00
Willi Goesgens 931451c279 Add compatibility for RSpec V3 2015-09-07 13:13:58 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann c558a19511 added tests for timeouts 2015-08-16 23:28:49 +02:00
Jan Steemann 7468b13958 do not test on message strings, but error codes 2015-08-12 22:13:08 +02:00
Jan Steemann 57fa0e45a9 fixed test when using SSL 2015-07-30 12:20:12 +02:00
Jan Steemann 05a233bec9 fixed failing test 2015-07-29 18:19:01 +02:00
Heiko Kernbach 1d0dfad48c Merge branch 'devel' of github.com:arangodb/arangodb into web-ui 2015-07-29 16:46:03 +02:00
Jan Steemann 4920420097 lol httparty 2015-07-29 12:54:51 +02:00
Heiko Kernbach 89975821bb tests 2015-07-28 18:21:40 +02:00
Jan Steemann 118fd54fd0 split tests 2015-07-20 10:58:43 +02:00
Frank Celler 0f1ee72723 fixed version 2015-07-13 18:06:42 +02:00
Jan Steemann 0e42565aa8 added test for HTTP API 2015-06-27 05:50:32 +02:00
Jan Steemann 83b326cfc7 moved PUT /_api/simple/all to C++ 2015-06-18 15:34:45 +02:00
Jan Steemann a41a84cc62 fixed test 2015-06-02 15:11:43 +02:00
Michael Hackstein 25aa2a58c3 Temprorarily disabled a neighbors test using the old return format. Will be reactivated soon 2015-05-30 00:41:28 -07:00
Jan Steemann f6bc0a05e3 added `limit` parameter for export API 2015-05-12 14:16:27 +02:00
Jan Steemann 63138def67 fix location response headers with special characters 2015-05-05 14:00:06 +02:00
Jan Steemann ce7ea1e287 fixed test 2015-04-30 23:38:39 +02:00
Jan Steemann eaa49b11c6 rename file 2015-04-17 17:48:34 +02:00
Jan Steemann 6e23c5330f added restrictions for export API 2015-04-17 00:24:43 +02:00
Jan Steemann 92fcdd3e56 issue #1298: Bulk import if data already exists
This change extends the HTTP REST API for bulk imports as follows:

When documents are imported and the `_key` attribute is specified for them, the import can be
used for inserting and updating/replacing documents. Previously, the import could be used for
inserting new documents only, and re-inserting a document with an existing would have failed
with a *unique key constraint violated* error.

The above behavior is still the default. However, the API now allows controlling the behavior
in case of a unique key constraint error via the optional URL parameter `onDuplicate`.

This parameter can have one of the following values:

- `error`: when a unique key constraint error occurs, do not import or update the document but
  report an error. This is the default.

- `update`: when a unique key constraint error occurs, try to (partially) update the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. Only the attributes present in the import data will be
  updated and other attributes already present will be preserved. The number of updated documents
  will be reported in the `updated` attribute of the HTTP API result.

- `replace`: when a unique key constraint error occurs, try to fully replace the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. The number of replaced documents will be reported in the
  `updated` attribute of the HTTP API result.

- `ignore`: when a unique key constraint error occurs, ignore this error. There will be no
  insert, update or replace for the particular document. Ignored documents will be reported
  separately in the `ignored` attribute of the HTTP API result.

The result of the HTTP import API will now contain the attributes `ignored` and `updated`, which
contain the number of ignored and updated documents respectively. These attributes will contain a
value of zero unless the `onDuplicate` URL parameter is set to either `update` or `replace`
(in this case the `updated` attribute may contain non-zero values) or `ignore` (in this case the
`ignored` attribute may contain a non-zero value).
2015-04-14 11:44:33 +02:00
Jan Steemann 0f1244f72d better export API cleanup 2015-03-31 18:44:51 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00