Merge remote-tracking branch 'gerrit/master' into hbtreehbtree

Conflicts:
	src/daemon/daemon.pri
	src/daemon/jsondbview.cpp
	src/partition/jsondbindex.cpp
	src/partition/jsondbindex.h
	src/partition/jsondbindexquery.h
	src/partition/jsondbmanagedbtree.cpp
	src/partition/jsondbmanagedbtree.h
	src/partition/jsondbmanagedbtreetxn.cpp
	src/partition/jsondbmanagedbtreetxn.h
	src/partition/jsondbobjecttable.cpp
	src/partition/jsondbobjecttable.h
	src/partition/jsondbpartition.cpp
	src/partition/jsondbpartition.h
	tests/auto/auto.pro
	tests/auto/partition/testpartition.cpp
	tests/benchmarks/benchmarks.pro

Change-Id: I963adefd6d32fca9b3537981306b67538c759034

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/partition/json-validation/type-schema.json b/tests/auto/partition/json-validation/type-schema.json
new file mode 100644
index 0000000..4aad2ac
--- /dev/null
+++ b/tests/auto/partition/json-validation/type-schema.json
@@ -0,0 +1,33 @@
+{
+    "description": "check if a property type is correct",
+    "type": "object",
+    "properties": {
+        "string": {
+            "type": "string"
+        },
+        "number": {
+            "type": "number"
+        },
+        "integer": {
+            "type": "integer"
+        },
+        "boolean": {
+            "type": "boolean"
+        },
+        "object": {
+            "type": "object"
+        },
+        "array": {
+            "type": "array"
+        },
+        "null": {
+            "type": "null"
+        },
+        "any": {
+            "type": "any"
+        },
+        "mixed": {
+            "type": ["string", "integer"]
+        }
+    }
+}