Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,323 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

6358 Commits

Author SHA1 Message Date
Willi Goesgens 0225311f2d Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-09-11 13:25:18 +02:00
Willi Goesgens 01363e6759 UnitTests: divert to AQL2 in the modifying queries tests; adjust to new reply-syntax. 2014-09-11 11:32:44 +02:00
Willi Goesgens f8b681a5f8 re-enable test; its working now. 2014-09-11 11:31:49 +02:00
Jan Steemann cb4c60a36f explain tests 2014-09-11 09:54:59 +02:00
Jan Steemann 3487d7c9ba added derived file 2014-09-10 15:56:02 +02:00
Jan Steemann c034307dca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Utils/CollectionNameResolver.h
 2014-09-10 15:54:49 +02:00
Michael Hackstein 03cf0d69fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-10 15:50:28 +02:00
Michael Hackstein 9b62c7367b Deprecated _directedRelation and _undirectedRelation in general-graphs. Created _relation in general-graphs creating a _directedRelation. Handling undirected relations is now given to the user / api-implementor as arangodb itself does not offer any direction constrains which caused some confusion 2014-09-10 15:50:22 +02:00
Jan Steemann 8c9436a92b attempt to shield test from other influences 2014-09-10 15:01:50 +02:00
Jan Steemann 1907d8bb05 added optimizer rule test 2014-09-10 14:35:18 +02:00
Jan Steemann 39f64dcc5f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-10 14:32:20 +02:00
Jan Steemann 7113480e98 changed return value of applicationContext.collectionName 
Now, a valid collection name is always returned, even if the application name prefix contains invalid characters
 2014-09-10 14:30:45 +02:00
Willi Goesgens 74248e64f0 Finalize the remove unnecessary calculation tests. 2014-09-10 13:58:53 +02:00
Jan Steemann 7d74347590 issue #1016: AQL editor bug 2014-09-10 13:39:10 +02:00
Michael Hackstein d6d16f0643 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-10 13:19:27 +02:00
Jan Steemann c05d844626 fixed test assertion 2014-09-10 12:08:25 +02:00
Jan Steemann f824474503 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-10 12:00:10 +02:00
Jan Steemann 2c37bd89b7 specified test result assertion 2014-09-10 11:59:35 +02:00
scottashton 9a739ec403 fixed bug in floyd-warshall result generation 2014-09-10 11:47:35 +02:00
Jan Steemann e7c775226b added jshint target 2014-09-10 11:46:11 +02:00
Jan Steemann c027750d19 jshint 2014-09-10 11:45:59 +02:00
Jan Steemann 2642888b6d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-09 23:33:31 +02:00
Jan Steemann bb56982988 fixed copy&paste error 2014-09-09 23:32:58 +02:00
Jan Steemann 346a41a009 fixed reporting of "undefined" response code 2014-09-09 23:18:25 +02:00
Jan Steemann c89a3223f6 added missing newline 2014-09-09 22:40:13 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Jan Steemann 4522299ce8 fixed escaping of deletion button in AQL queries overview 2014-09-09 21:09:26 +02:00
Jan Steemann 11a490170d jslint 2014-09-09 20:38:18 +02:00
Jan Steemann 3bda3a1c0d fixed cursor positioning in collections search 2014-09-09 20:36:01 +02:00
Jan Steemann 80f7f61649 prevent XSS in user management views 2014-09-09 20:32:57 +02:00
Jan Steemann 2f89193e6c prevent XSS in AQL editor 2014-09-09 20:18:13 +02:00
Jan Steemann 428865f3b5 issue #1014: WITHIN function returns wrong distance 
added attribute setters for ShapedJson so document attributes can be updated

Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-09 19:58:27 +02:00
Willi Goesgens bdeb2d9d0f Remove unnecessary calculations test now has all tests to check for whether the rule applies. 2014-09-09 18:25:19 +02:00
Willi Goesgens 69e388dec3 SortNode optimizations: adjust tests to another rule needed to remove the SortNodes dependency. 2014-09-09 18:08:08 +02:00
Alan Plum 844621f070 Implemented Foxx.createQuery. 2014-09-09 17:02:21 +02:00
Jan Steemann 2a49bf843d updated tests 2014-09-09 15:20:42 +02:00
Alan Plum dfe193b1a4 Updated AQB. 2014-09-09 13:18:31 +02:00
Michael Hackstein 7c940d4d44 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-09 12:53:36 +02:00
Michael Hackstein 449936b99e Added a more precise information returned from gharial for collections 2014-09-09 12:53:31 +02:00
Jan Steemann 8127ff49bd more tests 2014-09-09 11:04:30 +02:00
Jan Steemann 8bf495f9b5 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-09 09:58:04 +02:00
Jan Steemann 639a026c66 fixed tests 2014-09-09 09:57:52 +02:00
Max Neunhoeffer b02856bff1 Better failure message of testSleep. 2014-09-09 09:53:06 +02:00
Jan Steemann a9a7b7d6d0 finished test for optimizer rule remove-unnecessary-filters 2014-09-09 08:55:56 +02:00
Jan Steemann a5100e3849 fixed parse error 2014-09-09 08:45:50 +02:00
Jan Steemann 28fd6b84c9 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-08 17:33:21 +02:00
Jan Steemann 4bda3e3979 finished test for remove-redundant-sorts 2014-09-08 17:33:11 +02:00
Willi Goesgens e30227195a Start implementation for remove unecessary filters. 2014-09-08 15:38:38 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Jan Steemann 72cc344935 fixed buffer memleak 2014-09-08 12:05:28 +02:00