Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the json_object() function. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | json |
Files: | files | file ages | folders |
SHA1: |
414a95f3b79359f167858b2325fd2be2 |
User & Date: | drh 2015-08-12 17:23:34.617 |
Context
2015-08-13
| ||
13:54 | Experimental code (untested) for a JSONB datatype. (check-in: e3596ac7b1 user: drh tags: json) | |
2015-08-12
| ||
17:23 | Add the json_object() function. (check-in: 414a95f3b7 user: drh tags: json) | |
16:49 | Begin adding an extension that provides JSON SQL functions. (check-in: dde8afdd8d user: drh tags: json) | |
Changes
Changes to ext/misc/json.c.
︙ | ︙ | |||
190 191 192 193 194 195 196 | jsonZero(&jx); sqlite3_result_error(context, "JSON cannot hold BLOB values", -1); return; } } } jsonAppendRaw(&jx, "]", 1); | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | jsonZero(&jx); sqlite3_result_error(context, "JSON cannot hold BLOB values", -1); return; } } } jsonAppendRaw(&jx, "]", 1); jsonResult(&jx); } /* ** Implementation of the json_object(NAME,VALUE,...) function. Return a JSON ** object that contains all name/value given in arguments. Or if any name ** is not a string or if any value is a BLOB, throw an error. */ static void jsonObjectFunc( sqlite3_context *context, int argc, sqlite3_value **argv ){ int i; Json jx; char cSep = '{'; const char *z; u32 n; if( argc&1 ){ sqlite3_result_error(context, "json_object() requires an even number " "of arguments", -1); return; } jsonInit(&jx, context); for(i=0; i<argc; i+=2){ jsonAppendRaw(&jx, &cSep, 1); cSep = ','; if( sqlite3_value_type(argv[i])!=SQLITE_TEXT ){ sqlite3_result_error(context, "json_object() labels must be TEXT", -1); jsonZero(&jx); return; } z = (const char*)sqlite3_value_text(argv[i]); n = (u32)sqlite3_value_bytes(argv[i]); jsonAppendString(&jx, z, n); jsonAppendRaw(&jx, ":", 1); switch( sqlite3_value_type(argv[i+1]) ){ case SQLITE_NULL: { jsonAppendRaw(&jx, "null", 4); break; } case SQLITE_INTEGER: case SQLITE_FLOAT: { z = (const char*)sqlite3_value_text(argv[i+1]); n = (u32)sqlite3_value_bytes(argv[i+1]); jsonAppendRaw(&jx, z, n); break; } case SQLITE_TEXT: { z = (const char*)sqlite3_value_text(argv[i+1]); n = (u32)sqlite3_value_bytes(argv[i+1]); jsonAppendString(&jx, z, n); break; } default: { jsonZero(&jx); sqlite3_result_error(context, "JSON cannot hold BLOB values", -1); return; } } } jsonAppendRaw(&jx, "}", 1); jsonResult(&jx); } #ifdef _WIN32 __declspec(dllexport) #endif int sqlite3_json_init( sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi ){ int rc = SQLITE_OK; int i; static const struct { const char *zName; int nArg; void (*xFunc)(sqlite3_context*,int,sqlite3_value**); } aFunc[] = { { "json_array", -1, jsonArrayFunc }, { "json_object", -1, jsonObjectFunc }, }; SQLITE_EXTENSION_INIT2(pApi); (void)pzErrMsg; /* Unused parameter */ for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){ rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg, SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0, aFunc[i].xFunc, 0, 0); } return rc; } |
Changes to test/json1.test.
︙ | ︙ | |||
32 33 34 35 36 37 38 39 40 | 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, NULL, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 99); } {[-9223372036854775808,9223372036854775807,0,1,-1,0.0,1.0,-1.0,-1.0e+99,2.0e+100,"one","two","three",4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,null,21,22,23,24,25,26,27,28,29,30,31,"abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ",99]} finish_test | > > > > > > > > > > > > > > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, NULL, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ', 99); } {[-9223372036854775808,9223372036854775807,0,1,-1,0.0,1.0,-1.0,-1.0e+99,2.0e+100,"one","two","three",4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,null,21,22,23,24,25,26,27,28,29,30,31,"abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwyxzABCDEFGHIJKLMNOPQRSTUVWXYZ",99]} do_execsql_test json1-2.1 { SELECT json_object('a',1,'b',2.5,'c',null,'d','String Test'); } {{{"a":1,"b":2.5,"c":null,"d":"String Test"}}} do_catchsql_test json1-2.2 { SELECT json_object('a',1,2,2.5); } {1 {json_object() labels must be TEXT}} do_catchsql_test json1-2.3 { SELECT json_object('a',1,'b'); } {1 {json_object() requires an even number of arguments}} do_catchsql_test json1-2.4 { SELECT json_object('a',1,'b',x'abcd'); } {1 {JSON cannot hold BLOB values}} finish_test |