Merge pull request #1118 from IgorStepanov/ulong-json

support ulong values for Json
vibe-d · Jun 3, 2015 · 309ea82 · 309ea82
2 parents 4070d06 + 5a3224b
commit 309ea82
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 49 deletions.
diff --git a/examples/json/source/app.d b/examples/json/source/app.d
@@ -1,6 +1,7 @@
 import vibe.data.json;
 
 import std.stdio;
+import std.bigint;
 
 void main()
 {
@@ -17,4 +18,8 @@ void main()
 	Json parent = obj;
 	parent.remove("item1");
 	foreach (i; obj) writeln(i);
+
+	auto obj2 = parseJsonString(`{"serial":17559991181826658461}`);
+	writeln("serial: ", obj2["serial"]);
+	assert(obj2["serial"] == BigInt(17559991181826658461UL));
 }
diff --git a/source/vibe/data/bson.d b/source/vibe/data/bson.d
@@ -1604,6 +1604,7 @@ private Bson.Type jsonTypeToBsonType(Json.Type tp)
 		Bson.Type.null_,
 		Bson.Type.bool_,
 		Bson.Type.long_,
+		Bson.Type.long_,
 		Bson.Type.double_,
 		Bson.Type.string,
 		Bson.Type.array,
@@ -1626,6 +1627,9 @@ private Bson.Type writeBson(R)(ref R dst, in Json value)
 		case Json.Type.int_:
 			dst.put(toBsonData(cast(long)value));
 			return Bson.Type.long_;
+		case Json.Type.bigint:
+			dst.put(toBsonData(cast(long)value));
+			return Bson.Type.long_;
 		case Json.Type.float_:
 			dst.put(toBsonData(cast(double)value));
 			return Bson.Type.double_;