lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

bson dictionary's key can't be number

Browse Source
This commit is contained in:
Cloud Wu
2017-07-04 21:32:04 +08:00
parent 86883c7d9a
commit d6eb49e4eb
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lualib-src/lua-bson.c
View File

@@ -415,6 +415,8 @@ append_one(struct bson *bs, lua_State *L, const char *key, size_t sz, int depth)
append_key(bs, L, BSON_BOOLEAN, key, sz); append_key(bs, L, BSON_BOOLEAN, key, sz);
write_byte(bs, lua_toboolean(L,-1)); write_byte(bs, lua_toboolean(L,-1));
break; break;
case LUA_TNIL:
luaL_error(L, "Bson array has a hole (nil), Use bson.null instead");
default: default:
luaL_error(L, "Invalid value type : %s", lua_typename(L,vt)); luaL_error(L, "Invalid value type : %s", lua_typename(L,vt));
} }
@@ -452,12 +454,7 @@ pack_dict_data(lua_State *L, struct bson *b, int depth, int kt) {
size_t sz; size_t sz;
switch(kt) { switch(kt) {
case LUA_TNUMBER: case LUA_TNUMBER:
// copy key, don't change key type luaL_error(L, "Bson dictionary's key can't be number");
lua_pushvalue(L,-2);
lua_insert(L,-2);
key = lua_tolstring(L,-2,&sz);
append_one(b, L, key, sz, depth);
lua_pop(L,2);
break; break;
case LUA_TSTRING: case LUA_TSTRING:
key = lua_tolstring(L,-2,&sz); key = lua_tolstring(L,-2,&sz);

12
test/testbson.lua
View File

@@ -22,9 +22,9 @@ end
local obj_a = { local obj_a = {
__data = { __data = {
[1] = 2, ["1"] = 2,
[3] = 4, ["3"] = 4,
[5] = 6, ["5"] = 6,
} }
} }
@@ -38,9 +38,9 @@ setmetatable(
local obj_b = { local obj_b = {
__data = { __data = {
[7] = 8, ["7"] = 8,
[9] = 10, ["9"] = 10,
[11] = obj_a, ["11"] = obj_a,
} }
} }