25 Commits

Author	SHA1	Message	Date
Frank Celler	ac9f375fb5	big reformat	2018-12-26 00:54:03 +01:00
Jan	f9dc610c1e	Bug fix/internal issue 2658 (#5760) (#5778)	2018-07-05 10:19:28 +02:00
Jan	cee529727c	Squashed commit of the following: (#4092)	2018-05-26 10:56:26 +02:00
Jan Christoph Uhde	a2dcb6cc5d	WIP - start adding optional overwrite to insert operation (RepSert) (#5268)	2018-05-24 19:47:15 +02:00
Max Neunhoeffer	1fed0239f7	Fix writing of edges in AQL to smart edge collections.	2016-10-10 00:25:46 +02:00
Max Neunhoeffer	f316a9bc4c	More changes for AQL writing to smart edge collections.	2016-10-08 00:48:23 +02:00
jsteemann	21dd73074a	cppcheck	2016-08-18 16:57:55 +02:00
jsteemann	1cfee8059a	remove TRI_json_t remainders	2016-08-18 16:13:52 +02:00
jsteemann	4a7c9f0f68	simplified bloated comments	2016-04-09 11:27:30 +02:00
Michael Hackstein	f767636f14	Added a toVelocyPack serialisation to all Aql Nodes and their dependencies. Right now in parallel to toJson.	2016-02-16 00:04:32 +01:00
Jan Steemann	9046e1831b	clang-format	2016-01-27 13:43:46 +01:00
jsteemann	431900f17a	changed namespace from triagens to arangodb	2016-01-17 00:44:53 +01:00
Jan Steemann	687d6133f0	comments reformatting	2016-01-11 09:52:39 +01:00
Jan Steemann	3ad20c0cae	auto-generated headers	2016-01-06 18:41:51 +01:00
Jan Steemann	a3b026d9d1	removed useless sections from code, unified include guards	2016-01-06 14:15:22 +01:00
Jan Steemann	f422576ee0	clang-format	2016-01-05 17:43:24 +01:00
Jan Steemann	dd74c6ac87	execute read and write operations of different collections in the same AQL query in lockstep, and not sequentially	2015-02-05 18:27:10 +01:00
Max Neunhoeffer	1cdf439845	Broken version, errors not yet fixed.	2014-12-23 16:51:48 +01:00
Jan Steemann	b4a0443da7	fixed default behavior of merge	2014-12-08 11:23:05 +01:00
Alan Plum	41ab3aa4d6	Renamed mergeArrays->mergeObjects to make API less confusing.	2014-12-02 17:03:03 +01:00
Jan Steemann	ac36c0cd7a	added mergeArrays attribute	2014-11-28 13:58:49 +01:00
Willi Goesgens	c71d142b51	We missed to output the modification options vector.	2014-09-16 18:25:41 +02:00
Willi Goesgens	1a6487ab14	Json de/serialization	2014-08-19 16:09:37 +02:00
Jan Steemann	7b3389b55c	modification queries	2014-08-18 13:52:41 +02:00
Jan Steemann	773c29cecf	further work on RemoveNode	2014-08-15 12:20:17 +02:00