1
0
Fork 0
Commit Graph

1923 Commits

Author SHA1 Message Date
Jan Steemann f6b424b833 use auto 2014-08-23 03:20:38 +02:00
Jan Steemann 6f5271823e use auto 2014-08-23 01:54:28 +02:00
Jan Steemann 51515afb68 optimization for the empty string 2014-08-23 01:28:40 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 86bf8e3c4f removed unused function argument 2014-08-23 00:50:37 +02:00
Jan Steemann 70732ce9ef added derived file 2014-08-22 21:53:54 +02:00
Jan Steemann 7330597f15 fixed ambigious method JsonHelper::getStringValue 2014-08-22 21:53:29 +02:00
Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/BasicsC/voc-errors.h
2014-08-22 21:51:38 +02:00
Jan Steemann 04fbe668cc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-22 17:58:12 +02:00
Jan Steemann 9f9277357b some more asserts 2014-08-22 17:57:47 +02:00
Max Neunhoeffer 3413eec1b7 Fix a merge mistake. 2014-08-22 17:03:45 +02:00
Max Neunhoeffer 4b229c5873 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/Basics/JsonHelper.h
2014-08-22 17:02:06 +02:00
James 931aaee618 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Aql/OptimizerRules.cpp
2014-08-22 16:19:01 +02:00
James 4c49a3be5e deserialising of IndexRangeNode almost completed. 2014-08-22 16:17:10 +02:00
James 0c4f8c1466 adding some more helper functions to get json array entries. 2014-08-22 15:05:08 +02:00
Jan Steemann 45d5d0f53a cppcheck 2014-08-22 13:53:21 +02:00
Max Neunhoeffer e5f09bfd87 Fix an invalid throw() by removing it. 2014-08-22 13:46:33 +02:00
Jan Steemann c0d0c0c347 fail when using wrong memory zone 2014-08-22 13:07:00 +02:00
Jan Steemann 0f03ca0a2b cppcheck 2014-08-22 12:50:06 +02:00
Max Neunhoeffer 5d15b4fba5 Silence an (unjustified) compiler warning. 2014-08-22 09:33:26 +02:00
Willi Goesgens 37a636d929 Add deleted constructor to avoid the compiler falling through to the bool constructor in case of missuse. 2014-08-20 16:56:52 +02:00
Jan Steemann 99ce138c12 fixed creation of subqueries from JSON input 2014-08-19 18:51:11 +02:00
Willi Goesgens 49126ea6c1 empty change 2014-08-19 16:10:38 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Max Neunhoeffer 1e592cebb9 Delete const copy constructor for better error messages. 2014-08-15 16:38:34 +02:00
Max Neunhoeffer 86055a7773 Further cleanup of Json wrapper class. 2014-08-15 14:38:10 +02:00
Max Neunhoeffer 21eda8a212 Withdraw some operator magic for Json wrapper class. 2014-08-15 13:29:01 +02:00
James b5327b3770 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-14 15:21:07 +02:00
James 392c1db4c3 JS_ExecuteAql now returns a cursor. 2014-08-14 15:20:52 +02:00
Max Neunhoeffer 2bf01eae1b Remove tabs. 2014-08-14 13:07:20 +02:00
Willi Goesgens a5c031505b Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-13 17:12:46 +02:00
Willi Goesgens dd1845ac8a Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
2014-08-13 16:29:57 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Jan Steemann a2061f66a3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:54:25 +02:00
Jan Steemann 24f1f979d0 fixed jsonification of values 2014-08-11 14:54:14 +02:00
Max Neunhoeffer e065c1e507 Fix a bug in JsonHelper about autofree. 2014-08-11 14:28:34 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
James a4f357c15e EnumerateListBlock now working for JSON lists and prepended "explicit" to Json constructors.. 2014-08-08 09:43:54 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Jan Steemann cb2e9a8a37 fixed JSON conversion 2014-08-07 15:48:33 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Jan Steemann ac7b47c0b7 nullptr 2014-08-06 09:42:36 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
2014-08-05 15:09:28 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00