Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Change the API for binding strings and blobs so that the destructor now carries an extra argument which can be used as the sqlite4_env pointer, thus allowing functions like sqlite4_free() to be used as a string or blob destructor. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
56335097b187b038c4ee64a65a33ddbd |
User & Date: | drh 2013-02-13 12:28:13.287 |
Context
2013-02-14
| ||
15:32 | Fold in Peter Reid's fixes and enhancements to the sqlite4_num object. check-in: 8ede88c1df user: drh tags: trunk | |
2013-02-13
| ||
12:28 | Change the API for binding strings and blobs so that the destructor now carries an extra argument which can be used as the sqlite4_env pointer, thus allowing functions like sqlite4_free() to be used as a string or blob destructor. check-in: 56335097b1 user: drh tags: trunk | |
2013-02-11
| ||
18:33 | Fix the data decoder so that it correctly handles +Inf and -Inf. check-in: c04b47fd62 user: drh tags: trunk | |
Changes
Changes to src/alter.c.
︙ | ︙ | |||
75 76 77 78 79 80 81 | len = sqlite4GetToken(zCsr, &token); } while( token==TK_SPACE ); assert( len>0 ); } while( token!=TK_LP && token!=TK_USING ); zRet = sqlite4MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, zTableName, tname.z+tname.n); | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | len = sqlite4GetToken(zCsr, &token); } while( token==TK_SPACE ); assert( len>0 ); } while( token!=TK_LP && token!=TK_USING ); zRet = sqlite4MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, zTableName, tname.z+tname.n); sqlite4_result_text(context, zRet, -1, SQLITE4_TRANSIENT, 0); sqlite4DbFree(db, zRet); } } /* ** This C function implements an SQL user function that is used by SQL code ** generated by the ALTER TABLE ... RENAME command to modify the definition |
︙ | ︙ | |||
138 139 140 141 142 143 144 | zInput = &z[n]; } sqlite4DbFree(db, zParent); } } zResult = sqlite4MPrintf(db, "%s%s", (zOutput?zOutput:""), zInput), | | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | zInput = &z[n]; } sqlite4DbFree(db, zParent); } } zResult = sqlite4MPrintf(db, "%s%s", (zOutput?zOutput:""), zInput), sqlite4_result_text(context, zResult, -1, SQLITE4_TRANSIENT, 0); sqlite4DbFree(db, zOutput); sqlite4DbFree(db, zResult); } #endif #ifndef SQLITE4_OMIT_TRIGGER /* This function is used by SQL generated to implement the |
︙ | ︙ | |||
216 217 218 219 220 221 222 | } while( dist!=2 || (token!=TK_WHEN && token!=TK_FOR && token!=TK_BEGIN) ); /* Variable tname now contains the token that is the old table-name ** in the CREATE TRIGGER statement. */ zRet = sqlite4MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, zTableName, tname.z+tname.n); | | | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | } while( dist!=2 || (token!=TK_WHEN && token!=TK_FOR && token!=TK_BEGIN) ); /* Variable tname now contains the token that is the old table-name ** in the CREATE TRIGGER statement. */ zRet = sqlite4MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, zTableName, tname.z+tname.n); sqlite4_result_text(context, zRet, -1, SQLITE4_TRANSIENT, 0); sqlite4DbFree(db, zRet); } } #endif /* !SQLITE4_OMIT_TRIGGER */ /* ** Register built-in functions used to help implement ALTER TABLE |
︙ | ︙ |
Changes to src/callback.c.
︙ | ︙ | |||
28 29 30 31 32 33 34 | db->xCollNeeded(db->pCollNeededArg, db, enc, zExternal); sqlite4DbFree(db, zExternal); } #ifndef SQLITE4_OMIT_UTF16 if( db->xCollNeeded16 ){ char const *zExternal; sqlite4_value *pTmp = sqlite4ValueNew(db); | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | db->xCollNeeded(db->pCollNeededArg, db, enc, zExternal); sqlite4DbFree(db, zExternal); } #ifndef SQLITE4_OMIT_UTF16 if( db->xCollNeeded16 ){ char const *zExternal; sqlite4_value *pTmp = sqlite4ValueNew(db); sqlite4ValueSetStr(pTmp, -1, zName, SQLITE4_UTF8, SQLITE4_STATIC, 0); zExternal = sqlite4ValueText(pTmp, SQLITE4_UTF16NATIVE); if( zExternal ){ db->xCollNeeded16(db->pCollNeededArg, db, (int)ENC(db), zExternal); } sqlite4ValueFree(pTmp); } #endif |
︙ | ︙ |
Changes to src/complete.c.
︙ | ︙ | |||
265 266 267 268 269 270 271 | int rc = SQLITE4_NOMEM; #ifndef SQLITE4_OMIT_AUTOINIT rc = sqlite4_initialize(0); if( rc ) return rc; #endif pVal = sqlite4ValueNew(0); | | | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | int rc = SQLITE4_NOMEM; #ifndef SQLITE4_OMIT_AUTOINIT rc = sqlite4_initialize(0); if( rc ) return rc; #endif pVal = sqlite4ValueNew(0); sqlite4ValueSetStr(pVal, -1, zSql, SQLITE4_UTF16NATIVE, SQLITE4_STATIC, 0); zSql8 = sqlite4ValueText(pVal, SQLITE4_UTF8); if( zSql8 ){ rc = sqlite4_complete(zSql8); }else{ rc = SQLITE4_NOMEM; } sqlite4ValueFree(pVal); |
︙ | ︙ |
Changes to src/date.c.
︙ | ︙ | |||
810 811 812 813 814 815 816 | ){ DateTime x; if( isDate(context, argc, argv, &x)==0 ){ char zBuf[100]; computeYMD_HMS(&x); sqlite4_snprintf(zBuf,sizeof(zBuf), "%04d-%02d-%02d %02d:%02d:%02d", x.Y, x.M, x.D, x.h, x.m, (int)(x.s)); | | | | | 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 | ){ DateTime x; if( isDate(context, argc, argv, &x)==0 ){ char zBuf[100]; computeYMD_HMS(&x); sqlite4_snprintf(zBuf,sizeof(zBuf), "%04d-%02d-%02d %02d:%02d:%02d", x.Y, x.M, x.D, x.h, x.m, (int)(x.s)); sqlite4_result_text(context, zBuf, -1, SQLITE4_TRANSIENT, 0); } } /* ** time( TIMESTRING, MOD, MOD, ...) ** ** Return HH:MM:SS */ static void timeFunc( sqlite4_context *context, int argc, sqlite4_value **argv ){ DateTime x; if( isDate(context, argc, argv, &x)==0 ){ char zBuf[100]; computeHMS(&x); sqlite4_snprintf(zBuf,sizeof(zBuf), "%02d:%02d:%02d", x.h, x.m, (int)x.s); sqlite4_result_text(context, zBuf, -1, SQLITE4_TRANSIENT, 0); } } /* ** date( TIMESTRING, MOD, MOD, ...) ** ** Return YYYY-MM-DD */ static void dateFunc( sqlite4_context *context, int argc, sqlite4_value **argv ){ DateTime x; if( isDate(context, argc, argv, &x)==0 ){ char zBuf[100]; computeYMD(&x); sqlite4_snprintf(zBuf,sizeof(zBuf), "%04d-%02d-%02d", x.Y, x.M, x.D); sqlite4_result_text(context, zBuf, -1, SQLITE4_TRANSIENT, 0); } } /* ** strftime( FORMAT, TIMESTRING, MOD, MOD, ...) ** ** Return a string described by FORMAT. Conversions as follows: |
︙ | ︙ | |||
996 997 998 999 1000 1001 1002 | } default: z[j++] = '%'; break; } } } z[j] = 0; sqlite4_result_text(context, z, -1, | | | 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 | } default: z[j++] = '%'; break; } } } z[j] = 0; sqlite4_result_text(context, z, -1, z==zBuf ? SQLITE4_TRANSIENT : SQLITE4_DYNAMIC, 0); } /* ** current_time() ** ** This function returns the same value as time('now'). */ |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 | sqlite4_mutex_enter(sqlite4MutexAlloc(SQLITE4_MUTEX_STATIC_MASTER)); pTm = gmtime(&t); if( pTm ) memcpy(&sNow, pTm, sizeof(sNow)); sqlite4_mutex_leave(sqlite4MutexAlloc(SQLITE4_MUTEX_STATIC_MASTER)); #endif if( pTm ){ strftime(zBuf, 20, zFormat, &sNow); | | | 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 | sqlite4_mutex_enter(sqlite4MutexAlloc(SQLITE4_MUTEX_STATIC_MASTER)); pTm = gmtime(&t); if( pTm ) memcpy(&sNow, pTm, sizeof(sNow)); sqlite4_mutex_leave(sqlite4MutexAlloc(SQLITE4_MUTEX_STATIC_MASTER)); #endif if( pTm ){ strftime(zBuf, 20, zFormat, &sNow); sqlite4_result_text(context, zBuf, -1, SQLITE4_TRANSIENT, 0); } } #endif /* ** This function registered all of the above C functions as SQL ** functions. This should be the only routine in this file with |
︙ | ︙ |
Changes to src/fts5.c.
︙ | ︙ | |||
3392 3393 3394 3395 3396 3397 3398 | if( zErr==0 ){ zErr = sqlite4MPrintf(db, "error parsing expression: %d", rc); } goto fts5_parse_expr_out; } fts5PrintExpr(db, azCol, pExpr, &zRet); | | | 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 | if( zErr==0 ){ zErr = sqlite4MPrintf(db, "error parsing expression: %d", rc); } goto fts5_parse_expr_out; } fts5PrintExpr(db, azCol, pExpr, &zRet); sqlite4_result_text(pCtx, zRet, -1, SQLITE4_TRANSIENT, 0); fts5ExpressionFree(db, pExpr); sqlite4_free(sqlite4_db_env(db), zRet); fts5_parse_expr_out: if( p ) pTok->xDestroy(p); sqlite4DbFree(db, azCol); sqlite4_finalize(pStmt); |
︙ | ︙ | |||
3419 3420 3421 3422 3423 3424 3425 | int rc = sqlite4_create_function( db, "fts5_parse_expr", 3, SQLITE4_UTF8, 0, fts5_parse_expr, 0, 0 ); if( rc!=SQLITE4_OK ) return rc; #endif return sqlite4InitFts5Func(db); } | < | 3419 3420 3421 3422 3423 3424 3425 | int rc = sqlite4_create_function( db, "fts5_parse_expr", 3, SQLITE4_UTF8, 0, fts5_parse_expr, 0, 0 ); if( rc!=SQLITE4_OK ) return rc; #endif return sqlite4InitFts5Func(db); } |
Changes to src/fts5func.c.
︙ | ︙ | |||
45 46 47 48 49 50 51 | struct Fts5RankCtx { sqlite4 *db; double *aAvgdl; /* Average document size of each field */ int nPhrase; /* Number of phrases in query */ double *aIdf; /* IDF weights for each phrase in query */ }; | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | struct Fts5RankCtx { sqlite4 *db; double *aAvgdl; /* Average document size of each field */ int nPhrase; /* Number of phrases in query */ double *aIdf; /* IDF weights for each phrase in query */ }; static void fts5RankFreeCtx(void *pNotUsed, void *pCtx){ if( pCtx ){ Fts5RankCtx *p = (Fts5RankCtx *)pCtx; sqlite4DbFree(p->db, p); } } #define BM25_EXPLAIN 0x01 |
︙ | ︙ | |||
132 133 134 135 136 137 138 | if( p==0 ){ int nPhrase; /* Number of phrases in query expression */ int nByte; /* Number of bytes of data to allocate */ sqlite4_mi_phrase_count(pCtx, &nPhrase); nByte = sizeof(Fts5RankCtx) + (nPhrase+nField) * sizeof(double); p = (Fts5RankCtx *)sqlite4DbMallocZero(db, nByte); | | | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | if( p==0 ){ int nPhrase; /* Number of phrases in query expression */ int nByte; /* Number of bytes of data to allocate */ sqlite4_mi_phrase_count(pCtx, &nPhrase); nByte = sizeof(Fts5RankCtx) + (nPhrase+nField) * sizeof(double); p = (Fts5RankCtx *)sqlite4DbMallocZero(db, nByte); sqlite4_set_auxdata(pCtx, 0, (void *)p, fts5RankFreeCtx, 0); p = sqlite4_get_auxdata(pCtx, 0); if( !p ){ rc = SQLITE4_NOMEM; }else{ int N; /* Total number of docs in collection */ int ni; /* Number of docs with phrase i */ |
︙ | ︙ | |||
266 267 268 269 270 271 272 | } if( rc==SQLITE4_OK ){ if( bExplain ){ zExplain = sqlite4MAppendf( db, zExplain, "%s</table><b>overall rank=%.2f</b>", zExplain, rank ); | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | } if( rc==SQLITE4_OK ){ if( bExplain ){ zExplain = sqlite4MAppendf( db, zExplain, "%s</table><b>overall rank=%.2f</b>", zExplain, rank ); sqlite4_result_text(pCtx, zExplain, -1, SQLITE4_TRANSIENT, 0); }else{ sqlite4_result_double(pCtx, rank); } }else{ sqlite4_result_error_code(pCtx, rc); } sqlite4DbFree(db, zExplain); |
︙ | ︙ | |||
589 590 591 592 593 594 595 | if( rc==SQLITE4_OK ){ fts5SnippetImprove(pCtx, nTok, nSz, &aSnip[i]); rc = fts5SnippetText( pCtx, &aSnip[i], &text, nTok, zStart, zEnd, zEllipses ); } } | | | 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | if( rc==SQLITE4_OK ){ fts5SnippetImprove(pCtx, nTok, nSz, &aSnip[i]); rc = fts5SnippetText( pCtx, &aSnip[i], &text, nTok, zStart, zEnd, zEllipses ); } } sqlite4_result_text(pCtx, text.zOut, text.nOut, SQLITE4_TRANSIENT, 0); sqlite4DbFree(sqlite4_context_db_handle(pCtx), text.zOut); break; } } if( rc!=SQLITE4_OK ){ sqlite4_result_error_code(pCtx, rc); |
︙ | ︙ | |||
666 667 668 669 670 671 672 | void *p = SQLITE4_INT_TO_PTR(aRank[i].mask); const char *z = aRank[i].zName; rc = sqlite4_create_mi_function(db, z, -1, SQLITE4_UTF8, p, fts5Rank, 0); } return rc; } | < | 666 667 668 669 670 671 672 | void *p = SQLITE4_INT_TO_PTR(aRank[i].mask); const char *z = aRank[i].zName; rc = sqlite4_create_mi_function(db, z, -1, SQLITE4_UTF8, p, fts5Rank, 0); } return rc; } |
Changes to src/func.c.
︙ | ︙ | |||
71 72 73 74 75 76 77 | switch( sqlite4_value_type(argv[0]) ){ case SQLITE4_INTEGER: z = "integer"; break; case SQLITE4_TEXT: z = "text"; break; case SQLITE4_FLOAT: z = "real"; break; case SQLITE4_BLOB: z = "blob"; break; default: z = "null"; break; } | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | switch( sqlite4_value_type(argv[0]) ){ case SQLITE4_INTEGER: z = "integer"; break; case SQLITE4_TEXT: z = "text"; break; case SQLITE4_FLOAT: z = "real"; break; case SQLITE4_BLOB: z = "blob"; break; default: z = "null"; break; } sqlite4_result_text(context, z, -1, SQLITE4_STATIC, 0); } /* ** Implementation of the length() function */ static void lengthFunc( |
︙ | ︙ | |||
240 241 242 243 244 245 246 | while( *z && p1 ){ SQLITE4_SKIP_UTF8(z); p1--; } for(z2=z; *z2 && p2; p2--){ SQLITE4_SKIP_UTF8(z2); } | | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | while( *z && p1 ){ SQLITE4_SKIP_UTF8(z); p1--; } for(z2=z; *z2 && p2; p2--){ SQLITE4_SKIP_UTF8(z2); } sqlite4_result_text(context, (char*)z, (int)(z2-z), SQLITE4_TRANSIENT, 0); }else{ if( p1+p2>len ){ p2 = len-p1; if( p2<0 ) p2 = 0; } sqlite4_result_blob(context, (char*)&z[p1], (int)p2, SQLITE4_TRANSIENT, 0); } } /* ** Implementation of the round() function */ #ifndef SQLITE4_OMIT_FLOATING_POINT |
︙ | ︙ | |||
332 333 334 335 336 337 338 | assert( z2==(char*)sqlite4_value_text(argv[0]) ); if( z2 ){ z1 = contextMalloc(context, ((i64)n)+1); if( z1 ){ for(i=0; i<n; i++){ z1[i] = (char)sqlite4Toupper(z2[i]); } | | | | 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | assert( z2==(char*)sqlite4_value_text(argv[0]) ); if( z2 ){ z1 = contextMalloc(context, ((i64)n)+1); if( z1 ){ for(i=0; i<n; i++){ z1[i] = (char)sqlite4Toupper(z2[i]); } sqlite4_result_text(context, z1, n, SQLITE4_DYNAMIC, 0); } } } static void lowerFunc(sqlite4_context *context, int argc, sqlite4_value **argv){ char *z1; const char *z2; int i, n; UNUSED_PARAMETER(argc); z2 = (char*)sqlite4_value_text(argv[0]); n = sqlite4_value_bytes(argv[0]); /* Verify that the call to _bytes() does not invalidate the _text() pointer */ assert( z2==(char*)sqlite4_value_text(argv[0]) ); if( z2 ){ z1 = contextMalloc(context, ((i64)n)+1); if( z1 ){ for(i=0; i<n; i++){ z1[i] = sqlite4Tolower(z2[i]); } sqlite4_result_text(context, z1, n, SQLITE4_DYNAMIC, 0); } } } #if 0 /* This function is never used. */ /* |
︙ | ︙ | |||
430 431 432 433 434 435 436 | n = sqlite4_value_int(argv[0]); if( n<1 ){ n = 1; } p = contextMalloc(context, n); if( p ){ sqlite4_randomness(sqlite4_context_env(context), n, p); | | | 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | n = sqlite4_value_int(argv[0]); if( n<1 ){ n = 1; } p = contextMalloc(context, n); if( p ){ sqlite4_randomness(sqlite4_context_env(context), n, p); sqlite4_result_blob(context, (char*)p, n, SQLITE4_DYNAMIC, 0); } } /* ** Implementation of the last_insert_rowid() SQL function. The return ** value is the same as the sqlite4_last_insert_rowid() API function. */ |
︙ | ︙ | |||
750 751 752 753 754 755 756 | sqlite4_context *context, int NotUsed, sqlite4_value **NotUsed2 ){ UNUSED_PARAMETER2(NotUsed, NotUsed2); /* IMP: R-48699-48617 This function is an SQL wrapper around the ** sqlite4_libversion() C-interface. */ | | | | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 | sqlite4_context *context, int NotUsed, sqlite4_value **NotUsed2 ){ UNUSED_PARAMETER2(NotUsed, NotUsed2); /* IMP: R-48699-48617 This function is an SQL wrapper around the ** sqlite4_libversion() C-interface. */ sqlite4_result_text(context, sqlite4_libversion(), -1, SQLITE4_STATIC, 0); } /* ** Implementation of the sqlite_source_id() function. The result is a string ** that identifies the particular version of the source code used to build ** SQLite. */ static void sourceidFunc( sqlite4_context *context, int NotUsed, sqlite4_value **NotUsed2 ){ UNUSED_PARAMETER2(NotUsed, NotUsed2); /* IMP: R-24470-31136 This function is an SQL wrapper around the ** sqlite4_sourceid() C interface. */ sqlite4_result_text(context, sqlite4_sourceid(), -1, SQLITE4_STATIC, 0); } /* ** Implementation of the sqlite_log() function. This is a wrapper around ** sqlite4_log(). The return value is NULL. The function exists purely for ** its side-effects. */ |
︙ | ︙ | |||
826 827 828 829 830 831 832 | int n; assert( argc==1 ); UNUSED_PARAMETER(argc); /* IMP: R-04922-24076 The sqlite_compileoption_get() SQL function ** is a wrapper around the sqlite4_compileoption_get() C/C++ function. */ n = sqlite4_value_int(argv[0]); | | > | 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 | int n; assert( argc==1 ); UNUSED_PARAMETER(argc); /* IMP: R-04922-24076 The sqlite_compileoption_get() SQL function ** is a wrapper around the sqlite4_compileoption_get() C/C++ function. */ n = sqlite4_value_int(argv[0]); sqlite4_result_text(context, sqlite4_compileoption_get(n), -1, SQLITE4_STATIC, 0); } #endif /* SQLITE4_OMIT_COMPILEOPTION_DIAGS */ /* Array for converting from half-bytes (nybbles) into ASCII hex ** digits. */ static const char hexdigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', |
︙ | ︙ | |||
873 874 875 876 877 878 879 | zText[(i*2)+2] = hexdigits[(zBlob[i]>>4)&0x0F]; zText[(i*2)+3] = hexdigits[(zBlob[i])&0x0F]; } zText[(nBlob*2)+2] = '\''; zText[(nBlob*2)+3] = '\0'; zText[0] = 'x'; zText[1] = '\''; | | | 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 | zText[(i*2)+2] = hexdigits[(zBlob[i]>>4)&0x0F]; zText[(i*2)+3] = hexdigits[(zBlob[i])&0x0F]; } zText[(nBlob*2)+2] = '\''; zText[(nBlob*2)+3] = '\0'; zText[0] = 'x'; zText[1] = '\''; sqlite4_result_text(context, zText, -1, SQLITE4_TRANSIENT, 0); sqlite4_free(sqlite4_context_env(context), zText); } break; } case SQLITE4_TEXT: { int i,j; u64 n; |
︙ | ︙ | |||
897 898 899 900 901 902 903 | z[j++] = zArg[i]; if( zArg[i]=='\'' ){ z[j++] = '\''; } } z[j++] = '\''; z[j] = 0; | | | | 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 | z[j++] = zArg[i]; if( zArg[i]=='\'' ){ z[j++] = '\''; } } z[j++] = '\''; z[j] = 0; sqlite4_result_text(context, z, j, SQLITE4_DYNAMIC, 0); } break; } default: { assert( sqlite4_value_type(argv[0])==SQLITE4_NULL ); sqlite4_result_text(context, "NULL", 4, SQLITE4_STATIC, 0); break; } } } /* ** The hex() function. Interpret the argument as a blob. Return |
︙ | ︙ | |||
934 935 936 937 938 939 940 | if( zHex ){ for(i=0; i<n; i++, pBlob++){ unsigned char c = *pBlob; *(z++) = hexdigits[(c>>4)&0xf]; *(z++) = hexdigits[c&0xf]; } *z = 0; | | | 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | if( zHex ){ for(i=0; i<n; i++, pBlob++){ unsigned char c = *pBlob; *(z++) = hexdigits[(c>>4)&0xf]; *(z++) = hexdigits[c&0xf]; } *z = 0; sqlite4_result_text(context, zHex, n*2, SQLITE4_DYNAMIC, 0); } } /* ** The zeroblob(N) function returns a zero-filled blob of size N bytes. */ static void zeroblobFunc( |
︙ | ︙ | |||
1043 1044 1045 1046 1047 1048 1049 | } } assert( j+nStr-i+1==nOut ); memcpy(&zOut[j], &zStr[i], nStr-i); j += nStr - i; assert( j<=nOut ); zOut[j] = 0; | | | 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 | } } assert( j+nStr-i+1==nOut ); memcpy(&zOut[j], &zStr[i], nStr-i); j += nStr - i; assert( j<=nOut ); zOut[j] = 0; sqlite4_result_text(context, (char*)zOut, j, SQLITE4_DYNAMIC, 0); } /* ** Implementation of the TRIM(), LTRIM(), and RTRIM() functions. ** The userdata is 0x1 for left trim, 0x2 for right trim, 0x3 for both. */ static void trimFunc( |
︙ | ︙ | |||
1127 1128 1129 1130 1131 1132 1133 | nIn -= len; } } if( zCharSet ){ sqlite4_free(sqlite4_context_env(context), azChar); } } | | | 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 | nIn -= len; } } if( zCharSet ){ sqlite4_free(sqlite4_context_env(context), azChar); } } sqlite4_result_text(context, (char*)zIn, nIn, SQLITE4_TRANSIENT, 0); } /* IMP: R-25361-16150 This function is omitted from SQLite by default. It ** is only available if the SQLITE4_SOUNDEX compile-time option is used ** when SQLite is built. */ |
︙ | ︙ | |||
1182 1183 1184 1185 1186 1187 1188 | prevcode = 0; } } while( j<4 ){ zResult[j++] = '0'; } zResult[j] = 0; | | | | 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 | prevcode = 0; } } while( j<4 ){ zResult[j++] = '0'; } zResult[j] = 0; sqlite4_result_text(context, zResult, 4, SQLITE4_TRANSIENT, 0); }else{ /* IMP: R-64894-50321 The string "?000" is returned if the argument ** is NULL or contains no ASCII alphabetic characters. */ sqlite4_result_text(context, "?000", 4, SQLITE4_STATIC, 0); } } #endif /* SQLITE4_SOUNDEX */ #if 0 /*ndef SQLITE4_OMIT_LOAD_EXTENSION*/ /* ** A function that loads a shared-library extension then returns NULL. |
︙ | ︙ | |||
1414 1415 1416 1417 1418 1419 1420 | if( pAccum ){ if( pAccum->tooBig ){ sqlite4_result_error_toobig(context); }else if( pAccum->mallocFailed ){ sqlite4_result_error_nomem(context); }else{ sqlite4_result_text(context, sqlite4StrAccumFinish(pAccum), -1, | | | 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 | if( pAccum ){ if( pAccum->tooBig ){ sqlite4_result_error_toobig(context); }else if( pAccum->mallocFailed ){ sqlite4_result_error_nomem(context); }else{ sqlite4_result_text(context, sqlite4StrAccumFinish(pAccum), -1, SQLITE4_DYNAMIC, 0); } } } /* ** This routine does per-connection function registration. Most ** of the built-in functions above are part of the global function set. |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
25 26 27 28 29 30 31 | #ifdef SQLITE4_ENABLE_ICU # include "sqliteicu.h" #endif /* ** Dummy function used as a unique symbol for SQLITE4_DYNAMIC */ | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #ifdef SQLITE4_ENABLE_ICU # include "sqliteicu.h" #endif /* ** Dummy function used as a unique symbol for SQLITE4_DYNAMIC */ void sqlite4_dynamic(void *pArg,void *p){ (void)pArg; (void)p; } #ifndef SQLITE4_AMALGAMATION /* IMPLEMENTATION-OF: R-46656-45156 The sqlite4_version[] string constant ** contains the text of SQLITE4_VERSION macro. */ const char sqlite4_version[] = SQLITE4_VERSION; #endif |
︙ | ︙ | |||
1263 1264 1265 1266 1267 1268 1269 | sqlite4_mutex_enter(db->mutex); if( db->mallocFailed ){ z = (void *)outOfMem; }else{ z = sqlite4_value_text16(db->pErr); if( z==0 ){ sqlite4ValueSetStr(db->pErr, -1, sqlite4ErrStr(db->errCode), | | | 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 | sqlite4_mutex_enter(db->mutex); if( db->mallocFailed ){ z = (void *)outOfMem; }else{ z = sqlite4_value_text16(db->pErr); if( z==0 ){ sqlite4ValueSetStr(db->pErr, -1, sqlite4ErrStr(db->errCode), SQLITE4_UTF8, SQLITE4_STATIC, 0); z = sqlite4_value_text16(db->pErr); } /* A malloc() may have failed within the call to sqlite4_value_text16() ** above. If this is the case, then the db->mallocFailed flag needs to ** be cleared before returning. Do this directly, instead of via ** sqlite4ApiExit(), to avoid setting the database handle error message. */ |
︙ | ︙ |
Changes to src/shell.c.
︙ | ︙ | |||
317 318 319 320 321 322 323 | int argc, sqlite4_value **argv ){ assert( 0==argc ); assert( zShellStatic ); UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argv); | | | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | int argc, sqlite4_value **argv ){ assert( 0==argc ); assert( zShellStatic ); UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argv); sqlite4_result_text(context, zShellStatic, -1, SQLITE4_STATIC, 0); } /* ** This routine reads a line of text from FILE in, stores ** the text in memory obtained from malloc() and returns a pointer ** to the text. NULL is returned at end of file, or if malloc() |
︙ | ︙ | |||
1803 1804 1805 1806 1807 1808 1809 | int k; for(z=azCol[i], j=1, k=0; z[j]; j++){ if( z[j]=='"' ){ j++; if( z[j]==0 ) break; } z[k++] = z[j]; } z[k] = 0; } | | | 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 | int k; for(z=azCol[i], j=1, k=0; z[j]; j++){ if( z[j]=='"' ){ j++; if( z[j]==0 ) break; } z[k++] = z[j]; } z[k] = 0; } sqlite4_bind_text(pStmt, i+1, azCol[i], -1, SQLITE4_STATIC, 0); } sqlite4_step(pStmt); rc = sqlite4_reset(pStmt); free(zLine); if( rc!=SQLITE4_OK ){ fprintf(stderr,"Error: %s\n", sqlite4_errmsg(db)); zCommit = "ROLLBACK"; |
︙ | ︙ | |||
2168 2169 2170 2171 2172 2173 2174 | zSql = sqlite4_mprintf(0, "%z ORDER BY 1", zSql); rc = sqlite4_prepare(p->db, zSql, -1, &pStmt, 0); sqlite4_free(0, zSql); if( rc ) return rc; nRow = nAlloc = 0; azResult = 0; if( nArg>1 ){ | | | | 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 | zSql = sqlite4_mprintf(0, "%z ORDER BY 1", zSql); rc = sqlite4_prepare(p->db, zSql, -1, &pStmt, 0); sqlite4_free(0, zSql); if( rc ) return rc; nRow = nAlloc = 0; azResult = 0; if( nArg>1 ){ sqlite4_bind_text(pStmt, 1, azArg[1], -1, SQLITE4_TRANSIENT, 0); }else{ sqlite4_bind_text(pStmt, 1, "%", -1, SQLITE4_STATIC, 0); } while( sqlite4_step(pStmt)==SQLITE4_ROW ){ if( nRow>=nAlloc ){ char **azNew; int n = nAlloc*2 + 10; azNew = sqlite4_realloc(0, azResult, sizeof(azResult[0])*n); if( azNew==0 ){ |
︙ | ︙ |
Changes to src/sqlite.h.in.
︙ | ︙ | |||
1829 1830 1831 1832 1833 1834 1835 | ** [error code] if anything goes wrong. ** ^[SQLITE4_RANGE] is returned if the parameter ** index is out of range. ^[SQLITE4_NOMEM] is returned if malloc() fails. ** ** See also: [sqlite4_bind_parameter_count()], ** [sqlite4_bind_parameter_name()], and [sqlite4_bind_parameter_index()]. */ | | > | > | > | 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 | ** [error code] if anything goes wrong. ** ^[SQLITE4_RANGE] is returned if the parameter ** index is out of range. ^[SQLITE4_NOMEM] is returned if malloc() fails. ** ** See also: [sqlite4_bind_parameter_count()], ** [sqlite4_bind_parameter_name()], and [sqlite4_bind_parameter_index()]. */ int sqlite4_bind_blob(sqlite4_stmt*, int, const void*, int n, void(*)(void*,void*),void*); int sqlite4_bind_double(sqlite4_stmt*, int, double); int sqlite4_bind_int(sqlite4_stmt*, int, int); int sqlite4_bind_int64(sqlite4_stmt*, int, sqlite4_int64); int sqlite4_bind_null(sqlite4_stmt*, int); int sqlite4_bind_text(sqlite4_stmt*, int, const char*, int n, void(*)(void*,void*),void*); int sqlite4_bind_text16(sqlite4_stmt*, int, const void*, int, void(*)(void*,void*),void*); int sqlite4_bind_value(sqlite4_stmt*, int, const sqlite4_value*); int sqlite4_bind_zeroblob(sqlite4_stmt*, int, int n); /* ** CAPIREF: Number Of SQL Parameters ** ** ^This routine can be used to find the number of [SQL parameters] |
︙ | ︙ | |||
2660 2661 2662 2663 2664 2665 2666 | ** expressions that are constant at compile time. This includes literal ** values and [parameters].)^ ** ** These routines must be called from the same thread in which ** the SQL function is running. */ void *sqlite4_get_auxdata(sqlite4_context*, int N); | | > | | | 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 | ** expressions that are constant at compile time. This includes literal ** values and [parameters].)^ ** ** These routines must be called from the same thread in which ** the SQL function is running. */ void *sqlite4_get_auxdata(sqlite4_context*, int N); void sqlite4_set_auxdata(sqlite4_context*, int N, void*, void (*)(void*,void*),void*); /* ** CAPIREF: Constants Defining Special Destructor Behavior ** ** These are special values for the destructor that is passed in as the ** final argument to routines like [sqlite4_result_blob()]. ^If the destructor ** argument is SQLITE4_STATIC, it means that the content pointer is constant ** and will never change. It does not need to be destroyed. ^The ** SQLITE4_TRANSIENT value means that the content will likely change in ** the near future and that SQLite should make its own private copy of ** the content before returning. ** ** The typedef is necessary to work around problems in certain ** C++ compilers. See ticket #2191. */ typedef void (*sqlite4_destructor_type)(void*,void*); void sqlite4_dynamic(void*,void*); #define SQLITE4_STATIC ((sqlite4_destructor_type)0) #define SQLITE4_TRANSIENT ((sqlite4_destructor_type)-1) #define SQLITE4_DYNAMIC (sqlite4_dynamic) /* ** CAPIREF: Setting The Result Of An SQL Function |
︙ | ︙ | |||
2794 2795 2796 2797 2798 2799 2800 | ** [unprotected sqlite4_value] object is required, so either ** kind of [sqlite4_value] object can be used with this interface. ** ** If these routines are called from within the different thread ** than the one containing the application-defined function that received ** the [sqlite4_context] pointer, the results are undefined. */ | | > | > | > | > | > | 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 | ** [unprotected sqlite4_value] object is required, so either ** kind of [sqlite4_value] object can be used with this interface. ** ** If these routines are called from within the different thread ** than the one containing the application-defined function that received ** the [sqlite4_context] pointer, the results are undefined. */ void sqlite4_result_blob(sqlite4_context*, const void*, int, void(*)(void*,void*),void*); void sqlite4_result_double(sqlite4_context*, double); void sqlite4_result_error(sqlite4_context*, const char*, int); void sqlite4_result_error16(sqlite4_context*, const void*, int); void sqlite4_result_error_toobig(sqlite4_context*); void sqlite4_result_error_nomem(sqlite4_context*); void sqlite4_result_error_code(sqlite4_context*, int); void sqlite4_result_int(sqlite4_context*, int); void sqlite4_result_int64(sqlite4_context*, sqlite4_int64); void sqlite4_result_null(sqlite4_context*); void sqlite4_result_text(sqlite4_context*, const char*, int, void(*)(void*,void*),void*); void sqlite4_result_text16(sqlite4_context*, const void*, int, void(*)(void*,void*),void*); void sqlite4_result_text16le(sqlite4_context*, const void*, int, void(*)(void*,void*),void*); void sqlite4_result_text16be(sqlite4_context*, const void*, int, void(*)(void*,void*),void*); void sqlite4_result_value(sqlite4_context*, sqlite4_value*); void sqlite4_result_zeroblob(sqlite4_context*, int n); /* ** CAPIREF: Define New Collating Sequences ** ** ^This function adds, removes, or modifies a [collation] associated |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
2962 2963 2964 2965 2966 2967 2968 | # define sqlite4FileSuffix3(X,Y) #endif u8 sqlite4GetBoolean(const char *z); const void *sqlite4ValueText(sqlite4_value*, u8); int sqlite4ValueBytes(sqlite4_value*, u8); void sqlite4ValueSetStr(sqlite4_value*, int, const void *,u8, | | | 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 | # define sqlite4FileSuffix3(X,Y) #endif u8 sqlite4GetBoolean(const char *z); const void *sqlite4ValueText(sqlite4_value*, u8); int sqlite4ValueBytes(sqlite4_value*, u8); void sqlite4ValueSetStr(sqlite4_value*, int, const void *,u8, void(*)(void*,void*),void*); void sqlite4ValueFree(sqlite4_value*); sqlite4_value *sqlite4ValueNew(sqlite4 *); char *sqlite4Utf16to8(sqlite4 *, const void*, int, u8); #ifdef SQLITE4_ENABLE_STAT3 char *sqlite4Utf8to16(sqlite4 *, u8, char *, int, int *); #endif int sqlite4ValueFromExpr(sqlite4 *, Expr *, u8, u8, sqlite4_value **); |
︙ | ︙ |
Changes to src/tclsqlite.c.
︙ | ︙ | |||
502 503 504 505 506 507 508 | u8 *data; const char *zType = (pVar->typePtr ? pVar->typePtr->name : ""); char c = zType[0]; if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){ /* Only return a BLOB type if the Tcl variable is a bytearray and ** has no string representation. */ data = Tcl_GetByteArrayFromObj(pVar, &n); | | | | 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 | u8 *data; const char *zType = (pVar->typePtr ? pVar->typePtr->name : ""); char c = zType[0]; if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){ /* Only return a BLOB type if the Tcl variable is a bytearray and ** has no string representation. */ data = Tcl_GetByteArrayFromObj(pVar, &n); sqlite4_result_blob(context, data, n, SQLITE4_TRANSIENT, 0); }else if( c=='b' && strcmp(zType,"boolean")==0 ){ Tcl_GetIntFromObj(0, pVar, &n); sqlite4_result_int(context, n); }else if( c=='d' && strcmp(zType,"double")==0 ){ double r; Tcl_GetDoubleFromObj(0, pVar, &r); sqlite4_result_double(context, r); }else if( (c=='w' && strcmp(zType,"wideInt")==0) || (c=='i' && strcmp(zType,"int")==0) ){ Tcl_WideInt v; Tcl_GetWideIntFromObj(0, pVar, &v); sqlite4_result_int64(context, v); }else{ data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n); sqlite4_result_text(context, (char *)data, n, SQLITE4_TRANSIENT, 0); } } } #ifndef SQLITE4_OMIT_AUTHORIZATION /* ** This is the authentication function. It appends the authentication |
︙ | ︙ | |||
844 845 846 847 848 849 850 | char c = zType[0]; if( zVar[0]=='@' || (c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0) ){ /* Load a BLOB type if the Tcl variable is a bytearray and ** it has no string representation or the host ** parameter name begins with "@". */ data = Tcl_GetByteArrayFromObj(pVar, &n); | | | | 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 | char c = zType[0]; if( zVar[0]=='@' || (c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0) ){ /* Load a BLOB type if the Tcl variable is a bytearray and ** it has no string representation or the host ** parameter name begins with "@". */ data = Tcl_GetByteArrayFromObj(pVar, &n); sqlite4_bind_blob(pStmt, i, data, n, SQLITE4_STATIC, 0); Tcl_IncrRefCount(pVar); pPreStmt->apParm[iParm++] = pVar; }else if( c=='b' && strcmp(zType,"boolean")==0 ){ Tcl_GetIntFromObj(interp, pVar, &n); sqlite4_bind_int(pStmt, i, n); }else if( c=='d' && strcmp(zType,"double")==0 ){ double r; Tcl_GetDoubleFromObj(interp, pVar, &r); sqlite4_bind_double(pStmt, i, r); }else if( (c=='w' && strcmp(zType,"wideInt")==0) || (c=='i' && strcmp(zType,"int")==0) ){ Tcl_WideInt v; Tcl_GetWideIntFromObj(interp, pVar, &v); sqlite4_bind_int64(pStmt, i, v); }else{ data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n); sqlite4_bind_text(pStmt, i, (char *)data, n, SQLITE4_STATIC, 0); Tcl_IncrRefCount(pVar); pPreStmt->apParm[iParm++] = pVar; } }else{ sqlite4_bind_null(pStmt, i); } } |
︙ | ︙ | |||
1666 1667 1668 1669 1670 1671 1672 | for(i=0; i<nCol; i++){ /* check for null data, if so, bind as null */ if( (nNull>0 && strcmp(azCol[i], zNull)==0) || strlen30(azCol[i])==0 ){ sqlite4_bind_null(pStmt, i+1); }else{ | | | 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 | for(i=0; i<nCol; i++){ /* check for null data, if so, bind as null */ if( (nNull>0 && strcmp(azCol[i], zNull)==0) || strlen30(azCol[i])==0 ){ sqlite4_bind_null(pStmt, i+1); }else{ sqlite4_bind_text(pStmt, i+1, azCol[i], -1, SQLITE4_STATIC, 0); } } sqlite4_step(pStmt); rc = sqlite4_reset(pStmt); free(zLine); if( rc!=SQLITE4_OK ){ Tcl_AppendResult(interp,"Error: ", sqlite4_errmsg(pDb->db), 0); |
︙ | ︙ | |||
2799 2800 2801 2802 2803 2804 2805 | static void md5finalize(sqlite4_context *context){ MD5Context *p; unsigned char digest[16]; char zBuf[33]; p = sqlite4_aggregate_context(context, sizeof(*p)); MD5Final(digest,p); MD5DigestToBase16(digest, zBuf); | | | 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 | static void md5finalize(sqlite4_context *context){ MD5Context *p; unsigned char digest[16]; char zBuf[33]; p = sqlite4_aggregate_context(context, sizeof(*p)); MD5Final(digest,p); MD5DigestToBase16(digest, zBuf); sqlite4_result_text(context, zBuf, -1, SQLITE4_TRANSIENT, 0); } int Md5_Register(sqlite4 *db){ int rc = sqlite4_create_function(db, "md5sum", -1, SQLITE4_UTF8, 0, 0, md5step, md5finalize); sqlite4_overload_function(db, "md5sum", -1); /* To exercise this API */ return rc; } |
︙ | ︙ |
Changes to src/utf.c.
︙ | ︙ | |||
470 471 472 473 474 475 476 | ** ** NULL is returned if there is an allocation error. */ char *sqlite4Utf16to8(sqlite4 *db, const void *z, int nByte, u8 enc){ Mem m; memset(&m, 0, sizeof(m)); m.db = db; | | | 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | ** ** NULL is returned if there is an allocation error. */ char *sqlite4Utf16to8(sqlite4 *db, const void *z, int nByte, u8 enc){ Mem m; memset(&m, 0, sizeof(m)); m.db = db; sqlite4VdbeMemSetStr(&m, z, nByte, enc, SQLITE4_STATIC, 0); sqlite4VdbeChangeEncoding(&m, SQLITE4_UTF8); if( db->mallocFailed ){ sqlite4VdbeMemRelease(&m); m.z = 0; } assert( (m.flags & MEM_Term)!=0 || db->mallocFailed ); assert( (m.flags & MEM_Str)!=0 || db->mallocFailed ); |
︙ | ︙ | |||
498 499 500 501 502 503 504 | ** flag set. */ #ifdef SQLITE4_ENABLE_STAT3 char *sqlite4Utf8to16(sqlite4 *db, u8 enc, char *z, int n, int *pnOut){ Mem m; memset(&m, 0, sizeof(m)); m.db = db; | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | ** flag set. */ #ifdef SQLITE4_ENABLE_STAT3 char *sqlite4Utf8to16(sqlite4 *db, u8 enc, char *z, int n, int *pnOut){ Mem m; memset(&m, 0, sizeof(m)); m.db = db; sqlite4VdbeMemSetStr(&m, z, n, SQLITE4_UTF8, SQLITE4_STATIC, 0); if( sqlite4VdbeMemTranslate(&m, enc) ){ assert( db->mallocFailed ); return 0; } assert( m.z==m.zMalloc ); *pnOut = m.n; return m.z; |
︙ | ︙ |
Changes to src/util.c.
︙ | ︙ | |||
128 129 130 131 132 133 134 | db->errCode = err_code; if( zFormat ){ char *z; va_list ap; va_start(ap, zFormat); z = sqlite4VMPrintf(db, zFormat, ap); va_end(ap); | | | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | db->errCode = err_code; if( zFormat ){ char *z; va_list ap; va_start(ap, zFormat); z = sqlite4VMPrintf(db, zFormat, ap); va_end(ap); sqlite4ValueSetStr(db->pErr, -1, z, SQLITE4_UTF8, SQLITE4_DYNAMIC, 0); }else{ sqlite4ValueSetStr(db->pErr, 0, 0, SQLITE4_UTF8, SQLITE4_STATIC, 0); } } } /* ** Add an error message to pParse->zErrMsg and increment pParse->nErr. ** The following formatting characters are allowed: |
︙ | ︙ |
Changes to src/vdbe.c.
︙ | ︙ | |||
880 881 882 883 884 885 886 | case OP_String8: { /* same as TK_STRING, out2-prerelease */ assert( pOp->p4.z!=0 ); pOp->opcode = OP_String; pOp->p1 = sqlite4Strlen30(pOp->p4.z); #ifndef SQLITE4_OMIT_UTF16 if( encoding!=SQLITE4_UTF8 ){ | | > | 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 | case OP_String8: { /* same as TK_STRING, out2-prerelease */ assert( pOp->p4.z!=0 ); pOp->opcode = OP_String; pOp->p1 = sqlite4Strlen30(pOp->p4.z); #ifndef SQLITE4_OMIT_UTF16 if( encoding!=SQLITE4_UTF8 ){ rc = sqlite4VdbeMemSetStr(pOut, pOp->p4.z, -1, SQLITE4_UTF8, SQLITE4_STATIC, 0); if( rc==SQLITE4_TOOBIG ) goto too_big; if( SQLITE4_OK!=sqlite4VdbeChangeEncoding(pOut, encoding) ) goto no_mem; assert( pOut->zMalloc==pOut->z ); assert( pOut->flags & MEM_Dyn ); pOut->zMalloc = 0; pOut->flags |= MEM_Static; pOut->flags &= ~MEM_Dyn; |
︙ | ︙ | |||
946 947 948 949 950 951 952 | /* Opcode: Blob P1 P2 * P4 ** ** P4 points to a blob of data P1 bytes long. Store this ** blob in register P2. */ case OP_Blob: { /* out2-prerelease */ assert( pOp->p1 <= SQLITE4_MAX_LENGTH ); | | | 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 | /* Opcode: Blob P1 P2 * P4 ** ** P4 points to a blob of data P1 bytes long. Store this ** blob in register P2. */ case OP_Blob: { /* out2-prerelease */ assert( pOp->p1 <= SQLITE4_MAX_LENGTH ); sqlite4VdbeMemSetStr(pOut, pOp->p4.z, pOp->p1, 0, 0, 0); pOut->enc = encoding; UPDATE_MAX_BLOBSIZE(pOut); break; } /* Opcode: Variable P1 P2 * P4 * ** |
︙ | ︙ | |||
2253 2254 2255 2256 2257 2258 2259 | if( rc ){ sqlite4DbFree(db, aRec); }else{ if( nSeq ){ memcpy(&aRec[nRec], &aSeq[sizeof(aSeq)-nSeq], nSeq); } | | > | 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 | if( rc ){ sqlite4DbFree(db, aRec); }else{ if( nSeq ){ memcpy(&aRec[nRec], &aSeq[sizeof(aSeq)-nSeq], nSeq); } rc = sqlite4VdbeMemSetStr(pOut, (char *)aRec, nRec+nSeq, 0, SQLITE4_DYNAMIC, 0); REGISTER_TRACE(pOp->p3, pOut); UPDATE_MAX_BLOBSIZE(pOut); } break; } |
︙ | ︙ | |||
2343 2344 2345 2346 2347 2348 2349 | aRec = 0; rc = sqlite4VdbeEncodeKey(db, pData0, pC->pKeyInfo->nField, pC->iRoot, pC->pKeyInfo, &aRec, &nRec, 0 ); if( rc ){ sqlite4DbFree(db, aRec); }else{ | | > | | 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 | aRec = 0; rc = sqlite4VdbeEncodeKey(db, pData0, pC->pKeyInfo->nField, pC->iRoot, pC->pKeyInfo, &aRec, &nRec, 0 ); if( rc ){ sqlite4DbFree(db, aRec); }else{ rc = sqlite4VdbeMemSetStr(pKeyOut, (char *)aRec, nRec, 0, SQLITE4_DYNAMIC, 0); REGISTER_TRACE(keyReg, pKeyOut); UPDATE_MAX_BLOBSIZE(pKeyOut); } } /* If P3 is not 0, compute the data rescord */ if( rc==SQLITE4_OK && pOp->p3 ){ assert( pOp->p3<pOp->p1 || pOp->p3>=pOp->p1+pOp->p2 ); pOut = &aMem[pOp->p3]; memAboutToChange(p, pOut); aRec = 0; rc = sqlite4VdbeEncodeData(db, pData0, nField, &aRec, &nRec); if( rc ){ sqlite4DbFree(db, aRec); }else{ rc = sqlite4VdbeMemSetStr(pOut, (char *)aRec, nRec, 0, SQLITE4_DYNAMIC,0); REGISTER_TRACE(pOp->p3, pOut); UPDATE_MAX_BLOBSIZE(pOut); } } break; } |
︙ | ︙ | |||
3517 3518 3519 3520 3521 3522 3523 | pIn3 = &aMem[pOp->p3]; if( (pIn3->flags & MEM_Blob) && pIn3->n==nKey && 0==memcmp(pIn3->z, aKey, nKey) ){ pc = pOp->p2-1; }else{ | | | 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 | pIn3 = &aMem[pOp->p3]; if( (pIn3->flags & MEM_Blob) && pIn3->n==nKey && 0==memcmp(pIn3->z, aKey, nKey) ){ pc = pOp->p2-1; }else{ sqlite4VdbeMemSetStr(pIn3, (const char*)aKey, nKey, 0, SQLITE4_TRANSIENT,0); } break; }; /* Opcode: SorterData P1 P2 * * * ** |
︙ | ︙ | |||
3584 3585 3586 3587 3588 3589 3590 | rc = sqlite4KVCursorKey(pCrsr, &pData, &nData); }else{ rc = sqlite4KVCursorData(pCrsr, 0, -1, &pData, &nData); } if( rc==SQLITE4_OK && nData>db->aLimit[SQLITE4_LIMIT_LENGTH] ){ goto too_big; } | | | 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 | rc = sqlite4KVCursorKey(pCrsr, &pData, &nData); }else{ rc = sqlite4KVCursorData(pCrsr, 0, -1, &pData, &nData); } if( rc==SQLITE4_OK && nData>db->aLimit[SQLITE4_LIMIT_LENGTH] ){ goto too_big; } sqlite4VdbeMemSetStr(pOut, (const char*)pData, nData, 0, SQLITE4_TRANSIENT,0); pOut->enc = SQLITE4_UTF8; /* In case the blob is ever cast to text */ UPDATE_MAX_BLOBSIZE(pOut); break; } /* Opcode: Rowid P1 P2 * * * ** |
︙ | ︙ | |||
4105 4106 4107 4108 4109 4110 4111 | CHECK_FOR_INTERRUPT; pIn1 = &aMem[pOp->p1]; pOut = &aMem[pOp->p3]; if( (pIn1->flags & MEM_RowSet) && (aKey = sqlite4RowSetRead(pIn1->u.pRowSet, &nKey)) ){ | | > | 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 | CHECK_FOR_INTERRUPT; pIn1 = &aMem[pOp->p1]; pOut = &aMem[pOp->p3]; if( (pIn1->flags & MEM_RowSet) && (aKey = sqlite4RowSetRead(pIn1->u.pRowSet, &nKey)) ){ rc = sqlite4VdbeMemSetStr(pOut, (char const *)aKey, nKey, 0, SQLITE4_TRANSIENT, 0); sqlite4RowSetNext(pIn1->u.pRowSet); }else{ /* The RowSet is empty */ sqlite4VdbeMemSetNull(pIn1); pc = pOp->p2 - 1; } |
︙ | ︙ |
Changes to src/vdbe.h.
︙ | ︙ | |||
200 201 202 203 204 205 206 | int sqlite4VdbeAssertMayAbort(Vdbe *, int); void sqlite4VdbeTrace(Vdbe*,FILE*); #endif void sqlite4VdbeResetStepResult(Vdbe*); void sqlite4VdbeRewind(Vdbe*); int sqlite4VdbeReset(Vdbe*); void sqlite4VdbeSetNumCols(Vdbe*,int); | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | int sqlite4VdbeAssertMayAbort(Vdbe *, int); void sqlite4VdbeTrace(Vdbe*,FILE*); #endif void sqlite4VdbeResetStepResult(Vdbe*); void sqlite4VdbeRewind(Vdbe*); int sqlite4VdbeReset(Vdbe*); void sqlite4VdbeSetNumCols(Vdbe*,int); int sqlite4VdbeSetColName(Vdbe*, int, int, const char *, void(*)(void*,void*)); void sqlite4VdbeCountChanges(Vdbe*); sqlite4 *sqlite4VdbeDb(Vdbe*); void sqlite4VdbeSetSql(Vdbe*, const char *z, int n); void sqlite4VdbeSwap(Vdbe*,Vdbe*); VdbeOp *sqlite4VdbeTakeOpArray(Vdbe*, int*, int*); sqlite4_value *sqlite4VdbeGetValue(Vdbe*, int, u8); void sqlite4VdbeSetVarmask(Vdbe*, int); |
︙ | ︙ |
Changes to src/vdbeInt.h.
︙ | ︙ | |||
145 146 147 148 149 150 151 | u16 flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ u8 type; /* One of SQLITE4_NULL, SQLITE4_TEXT, SQLITE4_INTEGER, etc */ u8 enc; /* SQLITE4_UTF8, SQLITE4_UTF16BE, SQLITE4_UTF16LE */ #ifdef SQLITE4_DEBUG Mem *pScopyFrom; /* This Mem is a shallow copy of pScopyFrom */ void *pFiller; /* So that sizeof(Mem) is a multiple of 8 */ #endif | | > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | u16 flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ u8 type; /* One of SQLITE4_NULL, SQLITE4_TEXT, SQLITE4_INTEGER, etc */ u8 enc; /* SQLITE4_UTF8, SQLITE4_UTF16BE, SQLITE4_UTF16LE */ #ifdef SQLITE4_DEBUG Mem *pScopyFrom; /* This Mem is a shallow copy of pScopyFrom */ void *pFiller; /* So that sizeof(Mem) is a multiple of 8 */ #endif void (*xDel)(void*,void*); /* Function to delete Mem.z */ void *pDelArg; /* First argument to xDel() */ char *zMalloc; /* Dynamic buffer allocated by sqlite4_malloc() */ }; /* One or more of the following flags are set to indicate the validOK ** representations of the value stored in the Mem struct. ** ** If the MEM_Null flag is set, then the value is an SQL NULL value. |
︙ | ︙ | |||
213 214 215 216 217 218 219 | ** invocations. */ struct VdbeFunc { FuncDef *pFunc; /* The definition of the function */ int nAux; /* Number of entries allocated for apAux[] */ struct AuxData { void *pAux; /* Aux data for the i-th argument */ | | > | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | ** invocations. */ struct VdbeFunc { FuncDef *pFunc; /* The definition of the function */ int nAux; /* Number of entries allocated for apAux[] */ struct AuxData { void *pAux; /* Aux data for the i-th argument */ void (*xDelete)(void*,void*); /* Destructor for the aux data */ void *pDeleteArg; /* First argument to xDelete */ } apAux[1]; /* One slot for each function argument */ }; /* ** The "context" argument for a installable function. A pointer to an ** instance of this structure is the first argument to the routines used ** implement the SQL functions. |
︙ | ︙ | |||
394 395 396 397 398 399 400 | int sqlite4VdbeHalt(Vdbe*); int sqlite4VdbeChangeEncoding(Mem *, int); int sqlite4VdbeMemTooBig(Mem*); int sqlite4VdbeMemCopy(Mem*, const Mem*); void sqlite4VdbeMemShallowCopy(Mem*, const Mem*, int); void sqlite4VdbeMemMove(Mem*, Mem*); int sqlite4VdbeMemNulTerminate(Mem*); | | > | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | int sqlite4VdbeHalt(Vdbe*); int sqlite4VdbeChangeEncoding(Mem *, int); int sqlite4VdbeMemTooBig(Mem*); int sqlite4VdbeMemCopy(Mem*, const Mem*); void sqlite4VdbeMemShallowCopy(Mem*, const Mem*, int); void sqlite4VdbeMemMove(Mem*, Mem*); int sqlite4VdbeMemNulTerminate(Mem*); int sqlite4VdbeMemSetStr(Mem*, const char*, int, u8, void(*)(void*,void*),void*); void sqlite4VdbeMemSetInt64(Mem*, i64); #ifdef SQLITE4_OMIT_FLOATING_POINT # define sqlite4VdbeMemSetDouble sqlite4VdbeMemSetInt64 #else void sqlite4VdbeMemSetDouble(Mem*, double); #endif void sqlite4VdbeMemSetNull(Mem*); |
︙ | ︙ |
Changes to src/vdbeapi.c.
︙ | ︙ | |||
189 190 191 192 193 194 195 | ** then sets the error code to SQLITE4_TOOBIG */ static void setResultStrOrError( sqlite4_context *pCtx, /* Function context */ const char *z, /* String pointer */ int n, /* Bytes in string, or negative */ u8 enc, /* Encoding of z. 0 for BLOBs */ | | > | | > | | | | > | | > | | > | | > | | | | 189 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 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | ** then sets the error code to SQLITE4_TOOBIG */ static void setResultStrOrError( sqlite4_context *pCtx, /* Function context */ const char *z, /* String pointer */ int n, /* Bytes in string, or negative */ u8 enc, /* Encoding of z. 0 for BLOBs */ void (*xDel)(void*,void*), /* Destructor function */ void *pDelArg /* First argument to xDel() */ ){ if( xDel==SQLITE4_DYNAMIC ){ assert( sqlite4MemdebugHasType(z, MEMTYPE_HEAP) ); assert( sqlite4MemdebugNoType(z, ~MEMTYPE_HEAP) ); sqlite4MemdebugSetType((char*)z, MEMTYPE_DB | MEMTYPE_HEAP); } if( sqlite4VdbeMemSetStr(&pCtx->s, z, n, enc, xDel,pDelArg)==SQLITE4_TOOBIG ){ sqlite4_result_error_toobig(pCtx); } } void sqlite4_result_blob( sqlite4_context *pCtx, const void *z, int n, void (*xDel)(void*,void*), void *pDelArg ){ assert( n>=0 ); assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); setResultStrOrError(pCtx, z, n, 0, xDel, pDelArg); } void sqlite4_result_double(sqlite4_context *pCtx, double rVal){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetDouble(&pCtx->s, rVal); } void sqlite4_result_error(sqlite4_context *pCtx, const char *z, int n){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); pCtx->isError = SQLITE4_ERROR; sqlite4VdbeMemSetStr(&pCtx->s, z, n, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); } #ifndef SQLITE4_OMIT_UTF16 void sqlite4_result_error16(sqlite4_context *pCtx, const void *z, int n){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); pCtx->isError = SQLITE4_ERROR; sqlite4VdbeMemSetStr(&pCtx->s, z, n, SQLITE4_UTF16NATIVE,SQLITE4_TRANSIENT,0); } #endif void sqlite4_result_int(sqlite4_context *pCtx, int iVal){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetInt64(&pCtx->s, (i64)iVal); } void sqlite4_result_int64(sqlite4_context *pCtx, i64 iVal){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetInt64(&pCtx->s, iVal); } void sqlite4_result_null(sqlite4_context *pCtx){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetNull(&pCtx->s); } void sqlite4_result_text( sqlite4_context *pCtx, const char *z, int n, void (*xDel)(void*,void*), void *pDelArg ){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); setResultStrOrError(pCtx, z, n, SQLITE4_UTF8, xDel, pDelArg); } #ifndef SQLITE4_OMIT_UTF16 void sqlite4_result_text16( sqlite4_context *pCtx, const void *z, int n, void (*xDel)(void*,void*), void *pDelArg ){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); setResultStrOrError(pCtx, z, n, SQLITE4_UTF16NATIVE, xDel, pDelArg); } void sqlite4_result_text16be( sqlite4_context *pCtx, const void *z, int n, void (*xDel)(void*,void*), void *pDelArg ){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); setResultStrOrError(pCtx, z, n, SQLITE4_UTF16BE, xDel, pDelArg); } void sqlite4_result_text16le( sqlite4_context *pCtx, const void *z, int n, void (*xDel)(void*,void*), void *pDelArg ){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); setResultStrOrError(pCtx, z, n, SQLITE4_UTF16LE, xDel, pDelArg); } #endif /* SQLITE4_OMIT_UTF16 */ void sqlite4_result_value(sqlite4_context *pCtx, sqlite4_value *pValue){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemCopy(&pCtx->s, pValue); } void sqlite4_result_zeroblob(sqlite4_context *pCtx, int n){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetZeroBlob(&pCtx->s, n); } void sqlite4_result_error_code(sqlite4_context *pCtx, int errCode){ pCtx->isError = errCode; if( pCtx->s.flags & MEM_Null ){ sqlite4VdbeMemSetStr(&pCtx->s, sqlite4ErrStr(errCode), -1, SQLITE4_UTF8, SQLITE4_STATIC, 0); } } /* Force an SQLITE4_TOOBIG error. */ void sqlite4_result_error_toobig(sqlite4_context *pCtx){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); pCtx->isError = SQLITE4_TOOBIG; sqlite4VdbeMemSetStr(&pCtx->s, "string or blob too big", -1, SQLITE4_UTF8, SQLITE4_STATIC, 0); } /* An SQLITE4_NOMEM error. */ void sqlite4_result_error_nomem(sqlite4_context *pCtx){ assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); sqlite4VdbeMemSetNull(&pCtx->s); pCtx->isError = SQLITE4_NOMEM; |
︙ | ︙ | |||
587 588 589 590 591 592 593 | ** argument to the user-function defined by pCtx. Any previous value is ** deleted by calling the delete function specified when it was set. */ void sqlite4_set_auxdata( sqlite4_context *pCtx, int iArg, void *pAux, | | > | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 | ** argument to the user-function defined by pCtx. Any previous value is ** deleted by calling the delete function specified when it was set. */ void sqlite4_set_auxdata( sqlite4_context *pCtx, int iArg, void *pAux, void (*xDelete)(void*,void*), void *pDeleteArg ){ struct AuxData *pAuxData; VdbeFunc *pVdbeFunc; if( iArg<0 ) goto failed; assert( sqlite4_mutex_held(pCtx->s.db->mutex) ); pVdbeFunc = pCtx->pVdbeFunc; |
︙ | ︙ | |||
610 611 612 613 614 615 616 | memset(&pVdbeFunc->apAux[nAux], 0, sizeof(struct AuxData)*(iArg+1-nAux)); pVdbeFunc->nAux = iArg+1; pVdbeFunc->pFunc = pCtx->pFunc; } pAuxData = &pVdbeFunc->apAux[iArg]; if( pAuxData->pAux && pAuxData->xDelete ){ | | > | | 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 | memset(&pVdbeFunc->apAux[nAux], 0, sizeof(struct AuxData)*(iArg+1-nAux)); pVdbeFunc->nAux = iArg+1; pVdbeFunc->pFunc = pCtx->pFunc; } pAuxData = &pVdbeFunc->apAux[iArg]; if( pAuxData->pAux && pAuxData->xDelete ){ pAuxData->xDelete(pAuxData->pDeleteArg, pAuxData->pAux); } pAuxData->pAux = pAux; pAuxData->xDelete = xDelete; pAuxData->pDeleteArg = pDeleteArg; return; failed: if( xDelete ){ xDelete(pDeleteArg, pAux); } } #ifndef SQLITE4_OMIT_DEPRECATED /* ** Return the number of times the Step function of a aggregate has been ** called. |
︙ | ︙ | |||
1008 1009 1010 1011 1012 1013 1014 | ** Bind a text or BLOB value. */ static int bindText( sqlite4_stmt *pStmt, /* The statement to bind against */ int i, /* Index of the parameter to bind */ const void *zData, /* Pointer to the data to be bound */ int nData, /* Number of bytes of data to be bound */ | | > | | | > | | 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 | ** Bind a text or BLOB value. */ static int bindText( sqlite4_stmt *pStmt, /* The statement to bind against */ int i, /* Index of the parameter to bind */ const void *zData, /* Pointer to the data to be bound */ int nData, /* Number of bytes of data to be bound */ void (*xDel)(void*,void*), /* Destructor for the data */ void *pDelArg, /* First argument to xDel() */ u8 encoding /* Encoding for the data */ ){ Vdbe *p = (Vdbe *)pStmt; Mem *pVar; int rc; rc = vdbeUnbind(p, i); if( rc==SQLITE4_OK ){ if( zData!=0 ){ pVar = &p->aVar[i-1]; rc = sqlite4VdbeMemSetStr(pVar, zData, nData, encoding, xDel, pDelArg); if( rc==SQLITE4_OK && encoding!=0 ){ rc = sqlite4VdbeChangeEncoding(pVar, ENC(p->db)); } sqlite4Error(p->db, rc, 0); rc = sqlite4ApiExit(p->db, rc); } sqlite4_mutex_leave(p->db->mutex); }else if( xDel!=SQLITE4_STATIC && xDel!=SQLITE4_TRANSIENT ){ xDel(pDelArg, (void*)zData); } return rc; } /* ** Bind a blob value to an SQL statement variable. */ int sqlite4_bind_blob( sqlite4_stmt *pStmt, int i, const void *zData, int nData, void (*xDel)(void*,void*), void *pDelArg ){ return bindText(pStmt, i, zData, nData, xDel, pDelArg, 0); } int sqlite4_bind_double(sqlite4_stmt *pStmt, int i, double rValue){ int rc; Vdbe *p = (Vdbe *)pStmt; rc = vdbeUnbind(p, i); if( rc==SQLITE4_OK ){ sqlite4VdbeMemSetDouble(&p->aVar[i-1], rValue); |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 | return rc; } int sqlite4_bind_text( sqlite4_stmt *pStmt, int i, const char *zData, int nData, | | > | | > | | > | | 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 | return rc; } int sqlite4_bind_text( sqlite4_stmt *pStmt, int i, const char *zData, int nData, void (*xDel)(void*,void*), void *pDelArg ){ return bindText(pStmt, i, zData, nData, xDel, pDelArg, SQLITE4_UTF8); } #ifndef SQLITE4_OMIT_UTF16 int sqlite4_bind_text16( sqlite4_stmt *pStmt, int i, const void *zData, int nData, void (*xDel)(void*,void*), void *pDelArg ){ return bindText(pStmt, i, zData, nData, xDel, pDelArg, SQLITE4_UTF16NATIVE); } #endif /* SQLITE4_OMIT_UTF16 */ int sqlite4_bind_value(sqlite4_stmt *pStmt, int i, const sqlite4_value *pValue){ int rc; switch( pValue->type ){ case SQLITE4_INTEGER: { rc = sqlite4_bind_int64(pStmt, i, pValue->u.i); break; } case SQLITE4_FLOAT: { rc = sqlite4_bind_double(pStmt, i, pValue->r); break; } case SQLITE4_BLOB: { if( pValue->flags & MEM_Zero ){ rc = sqlite4_bind_zeroblob(pStmt, i, pValue->u.nZero); }else{ rc = sqlite4_bind_blob(pStmt, i, pValue->z, pValue->n, SQLITE4_TRANSIENT, 0); } break; } case SQLITE4_TEXT: { rc = bindText(pStmt,i, pValue->z, pValue->n, SQLITE4_TRANSIENT, 0, pValue->enc); break; } default: { rc = sqlite4_bind_null(pStmt, i); break; } |
︙ | ︙ |
Changes to src/vdbeaux.c.
︙ | ︙ | |||
1191 1192 1193 1194 1195 1196 1197 | if( sqlite4VdbeMemGrow(pMem, 32, 0) ){ /* P4 */ assert( p->db->mallocFailed ); return SQLITE4_ERROR; } pMem->flags = MEM_Dyn|MEM_Str|MEM_Term; z = displayP4(pOp, pMem->z, 32); if( z!=pMem->z ){ | | | 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 | if( sqlite4VdbeMemGrow(pMem, 32, 0) ){ /* P4 */ assert( p->db->mallocFailed ); return SQLITE4_ERROR; } pMem->flags = MEM_Dyn|MEM_Str|MEM_Term; z = displayP4(pOp, pMem->z, 32); if( z!=pMem->z ){ sqlite4VdbeMemSetStr(pMem, z, -1, SQLITE4_UTF8, 0, 0); }else{ assert( pMem->z!=0 ); pMem->n = sqlite4Strlen30(pMem->z); pMem->enc = SQLITE4_UTF8; } pMem->type = SQLITE4_TEXT; pMem++; |
︙ | ︙ | |||
1634 1635 1636 1637 1638 1639 1640 | ** to by zName will be freed by sqlite4DbFree() when the vdbe is destroyed. */ int sqlite4VdbeSetColName( Vdbe *p, /* Vdbe being configured */ int idx, /* Index of column zName applies to */ int var, /* One of the COLNAME_* constants */ const char *zName, /* Pointer to buffer containing name */ | | > > | | 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 | ** to by zName will be freed by sqlite4DbFree() when the vdbe is destroyed. */ int sqlite4VdbeSetColName( Vdbe *p, /* Vdbe being configured */ int idx, /* Index of column zName applies to */ int var, /* One of the COLNAME_* constants */ const char *zName, /* Pointer to buffer containing name */ void (*xDel)(void*,void*) /* Memory management strategy for zName */ ){ int rc; Mem *pColName; assert( idx<p->nResColumn ); assert( var<COLNAME_N ); assert( xDel==SQLITE4_STATIC || xDel==SQLITE4_TRANSIENT || xDel==SQLITE4_DYNAMIC ); if( p->db->mallocFailed ){ assert( !zName || xDel!=SQLITE4_DYNAMIC ); return SQLITE4_NOMEM; } assert( p->aColName!=0 ); pColName = &(p->aColName[idx+var*p->nResColumn]); rc = sqlite4VdbeMemSetStr(pColName, zName, -1, SQLITE4_UTF8, xDel, 0); assert( rc!=0 || !zName || (pColName->flags&MEM_Term)!=0 ); return rc; } /* ** Free all Savepoint structures that correspond to transaction levels ** larger than iLevel. Passing iLevel==1 deletes all Savepoint structures. |
︙ | ︙ | |||
1972 1973 1974 1975 1976 1977 1978 | */ int sqlite4VdbeTransferError(Vdbe *p){ sqlite4 *db = p->db; int rc = p->rc; if( p->zErrMsg ){ u8 mallocFailed = db->mallocFailed; sqlite4BeginBenignMalloc(db->pEnv); | | > | 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 | */ int sqlite4VdbeTransferError(Vdbe *p){ sqlite4 *db = p->db; int rc = p->rc; if( p->zErrMsg ){ u8 mallocFailed = db->mallocFailed; sqlite4BeginBenignMalloc(db->pEnv); sqlite4ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); sqlite4EndBenignMalloc(db->pEnv); db->mallocFailed = mallocFailed; db->errCode = rc; }else{ sqlite4Error(db, rc, 0); } return rc; |
︙ | ︙ | |||
2019 2020 2021 2022 2023 2024 2025 | if( p->runOnlyOnce ) p->expired = 1; }else if( p->rc && p->expired ){ /* The expired flag was set on the VDBE before the first call ** to sqlite4_step(). For consistency (since sqlite4_step() was ** called), set the database error in this case as well. */ sqlite4Error(db, p->rc, 0); | | > | 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 | if( p->runOnlyOnce ) p->expired = 1; }else if( p->rc && p->expired ){ /* The expired flag was set on the VDBE before the first call ** to sqlite4_step(). For consistency (since sqlite4_step() was ** called), set the database error in this case as well. */ sqlite4Error(db, p->rc, 0); sqlite4ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); sqlite4DbFree(db, p->zErrMsg); p->zErrMsg = 0; } /* Reclaim all memory used by the VDBE */ Cleanup(p); |
︙ | ︙ | |||
2081 2082 2083 2084 2085 2086 2087 | */ void sqlite4VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){ int i; for(i=0; i<pVdbeFunc->nAux; i++){ struct AuxData *pAux = &pVdbeFunc->apAux[i]; if( (i>31 || !(mask&(((u32)1)<<i))) && pAux->pAux ){ if( pAux->xDelete ){ | | | 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 | */ void sqlite4VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){ int i; for(i=0; i<pVdbeFunc->nAux; i++){ struct AuxData *pAux = &pVdbeFunc->apAux[i]; if( (i>31 || !(mask&(((u32)1)<<i))) && pAux->pAux ){ if( pAux->xDelete ){ pAux->xDelete(pAux->pDeleteArg, pAux->pAux); } pAux->pAux = 0; } } } /* |
︙ | ︙ |
Changes to src/vdbecodec.c.
︙ | ︙ | |||
141 142 143 144 145 146 147 | e = e>>2; while( e>=10 ){ r *= 1.0e10; e -= 10; } while( e>0 ){ r *= 10.0; e--; } } sqlite4VdbeMemSetDouble(pOut, r); }else if( cclass==0 ){ if( size==0 ){ | | | | | > | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | e = e>>2; while( e>=10 ){ r *= 1.0e10; e -= 10; } while( e>0 ){ r *= 10.0; e--; } } sqlite4VdbeMemSetDouble(pOut, r); }else if( cclass==0 ){ if( size==0 ){ sqlite4VdbeMemSetStr(pOut, "", 0, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); }else if( p->a[ofst]>0x02 ){ sqlite4VdbeMemSetStr(pOut, (char*)(p->a+ofst), size, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); }else{ static const u8 enc[] = {SQLITE4_UTF8,SQLITE4_UTF16LE,SQLITE4_UTF16BE }; sqlite4VdbeMemSetStr(pOut, (char*)(p->a+ofst+1), size-1, enc[p->a[ofst]], SQLITE4_TRANSIENT, 0); } }else{ sqlite4VdbeMemSetStr(pOut, (char*)(p->a+ofst), size, 0, SQLITE4_TRANSIENT, 0); } } testcase( i==iVal ); testcase( i==iVal+1 ); if( i<=iVal ){ if( pDefault ){ sqlite4VdbeMemShallowCopy(pOut, pDefault, MEM_Static); |
︙ | ︙ |
Changes to src/vdbemem.c.
︙ | ︙ | |||
89 90 91 92 93 94 95 | } if( pMem->z && preserve && pMem->zMalloc && pMem->z!=pMem->zMalloc ){ memcpy(pMem->zMalloc, pMem->z, pMem->n); } if( pMem->flags&MEM_Dyn && pMem->xDel ){ assert( pMem->xDel!=SQLITE4_DYNAMIC ); | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | } if( pMem->z && preserve && pMem->zMalloc && pMem->z!=pMem->zMalloc ){ memcpy(pMem->zMalloc, pMem->z, pMem->n); } if( pMem->flags&MEM_Dyn && pMem->xDel ){ assert( pMem->xDel!=SQLITE4_DYNAMIC ); pMem->xDel(pMem->pDelArg, (void *)(pMem->z)); } pMem->z = pMem->zMalloc; if( pMem->z==0 ){ pMem->flags = MEM_Null; }else{ pMem->flags &= ~(MEM_Ephem|MEM_Static); |
︙ | ︙ | |||
240 241 242 243 244 245 246 | if( p->flags&MEM_Agg ){ sqlite4VdbeMemFinalize(p, p->u.pDef); assert( (p->flags & MEM_Agg)==0 ); sqlite4VdbeMemRelease(p); }else if( p->flags&MEM_Dyn && p->xDel ){ assert( (p->flags&MEM_RowSet)==0 ); assert( p->xDel!=SQLITE4_DYNAMIC ); | | | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | if( p->flags&MEM_Agg ){ sqlite4VdbeMemFinalize(p, p->u.pDef); assert( (p->flags & MEM_Agg)==0 ); sqlite4VdbeMemRelease(p); }else if( p->flags&MEM_Dyn && p->xDel ){ assert( (p->flags&MEM_RowSet)==0 ); assert( p->xDel!=SQLITE4_DYNAMIC ); p->xDel(p->pDelArg, (void *)p->z); p->xDel = 0; }else if( p->flags&MEM_RowSet ){ sqlite4RowSetClear(p->u.pRowSet); }else if( p->flags&MEM_Frame ){ sqlite4VdbeMemSetNull(p); } } |
︙ | ︙ | |||
636 637 638 639 640 641 642 | ** either case, SQLITE4_TOOBIG is returned. */ int sqlite4VdbeMemSetStr( Mem *pMem, /* Memory cell to set to string value */ const char *z, /* String pointer */ int n, /* Bytes in string, or negative */ u8 enc, /* Encoding of z. 0 for BLOBs */ | | > | 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 | ** either case, SQLITE4_TOOBIG is returned. */ int sqlite4VdbeMemSetStr( Mem *pMem, /* Memory cell to set to string value */ const char *z, /* String pointer */ int n, /* Bytes in string, or negative */ u8 enc, /* Encoding of z. 0 for BLOBs */ void (*xDel)(void*,void*),/* Destructor function */ void *pDelArg /* First argument to xDel() */ ){ int nByte = n; /* New value for pMem->n */ int iLimit; /* Maximum allowed string or blob size */ u16 flags = 0; /* New value for pMem->flags */ assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( (pMem->flags & MEM_RowSet)==0 ); |
︙ | ︙ | |||
691 692 693 694 695 696 697 698 699 700 701 702 703 704 | sqlite4VdbeMemRelease(pMem); pMem->zMalloc = pMem->z = (char *)z; pMem->xDel = 0; }else{ sqlite4VdbeMemRelease(pMem); pMem->z = (char *)z; pMem->xDel = xDel; flags |= ((xDel==SQLITE4_STATIC)?MEM_Static:MEM_Dyn); } pMem->n = nByte; pMem->flags = flags; pMem->enc = (enc==0 ? SQLITE4_UTF8 : enc); pMem->type = (enc==0 ? SQLITE4_BLOB : SQLITE4_TEXT); | > | 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 | sqlite4VdbeMemRelease(pMem); pMem->zMalloc = pMem->z = (char *)z; pMem->xDel = 0; }else{ sqlite4VdbeMemRelease(pMem); pMem->z = (char *)z; pMem->xDel = xDel; pMem->pDelArg = pDelArg; flags |= ((xDel==SQLITE4_STATIC)?MEM_Static:MEM_Dyn); } pMem->n = nByte; pMem->flags = flags; pMem->enc = (enc==0 ? SQLITE4_UTF8 : enc); pMem->type = (enc==0 ? SQLITE4_BLOB : SQLITE4_TEXT); |
︙ | ︙ | |||
947 948 949 950 951 952 953 | pVal = sqlite4ValueNew(db); if( pVal==0 ) goto no_mem; if( ExprHasProperty(pExpr, EP_IntValue) ){ sqlite4VdbeMemSetInt64(pVal, (i64)pExpr->u.iValue*negInt); }else{ zVal = sqlite4MPrintf(db, "%s%s", zNeg, pExpr->u.zToken); if( zVal==0 ) goto no_mem; | | | 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 | pVal = sqlite4ValueNew(db); if( pVal==0 ) goto no_mem; if( ExprHasProperty(pExpr, EP_IntValue) ){ sqlite4VdbeMemSetInt64(pVal, (i64)pExpr->u.iValue*negInt); }else{ zVal = sqlite4MPrintf(db, "%s%s", zNeg, pExpr->u.zToken); if( zVal==0 ) goto no_mem; sqlite4ValueSetStr(pVal, -1, zVal, SQLITE4_UTF8, SQLITE4_DYNAMIC, 0); if( op==TK_FLOAT ) pVal->type = SQLITE4_FLOAT; } if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==SQLITE4_AFF_NONE ){ sqlite4ValueApplyAffinity(pVal, SQLITE4_AFF_NUMERIC, SQLITE4_UTF8); }else{ sqlite4ValueApplyAffinity(pVal, affinity, SQLITE4_UTF8); } |
︙ | ︙ | |||
988 989 990 991 992 993 994 | assert( pExpr->u.zToken[1]=='\'' ); pVal = sqlite4ValueNew(db); if( !pVal ) goto no_mem; zVal = &pExpr->u.zToken[2]; nVal = sqlite4Strlen30(zVal)-1; assert( zVal[nVal]=='\'' ); sqlite4VdbeMemSetStr(pVal, sqlite4HexToBlob(db, zVal, nVal), nVal/2, | | | 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 | assert( pExpr->u.zToken[1]=='\'' ); pVal = sqlite4ValueNew(db); if( !pVal ) goto no_mem; zVal = &pExpr->u.zToken[2]; nVal = sqlite4Strlen30(zVal)-1; assert( zVal[nVal]=='\'' ); sqlite4VdbeMemSetStr(pVal, sqlite4HexToBlob(db, zVal, nVal), nVal/2, 0, SQLITE4_DYNAMIC, 0); } #endif if( pVal ){ sqlite4VdbeMemStoreType(pVal); } *ppVal = pVal; |
︙ | ︙ | |||
1014 1015 1016 1017 1018 1019 1020 | ** Change the string value of an sqlite4_value object */ void sqlite4ValueSetStr( sqlite4_value *v, /* Value to be set */ int n, /* Length of string z */ const void *z, /* Text of the new string */ u8 enc, /* Encoding to use */ | | > | | 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 | ** Change the string value of an sqlite4_value object */ void sqlite4ValueSetStr( sqlite4_value *v, /* Value to be set */ int n, /* Length of string z */ const void *z, /* Text of the new string */ u8 enc, /* Encoding to use */ void (*xDel)(void*,void*), /* Destructor for the string */ void *pDelArg /* First argument to xDel() */ ){ if( v ) sqlite4VdbeMemSetStr((Mem *)v, z, n, enc, xDel, pDelArg); } /* ** Free an sqlite4_value object */ void sqlite4ValueFree(sqlite4_value *v){ if( !v ) return; |
︙ | ︙ |
Changes to src/vdbetrace.c.
︙ | ︙ | |||
126 127 128 129 130 131 132 | }else if( pVar->flags & MEM_Str ){ #ifndef SQLITE4_OMIT_UTF16 u8 enc = ENC(db); if( enc!=SQLITE4_UTF8 ){ Mem utf8; memset(&utf8, 0, sizeof(utf8)); utf8.db = db; | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | }else if( pVar->flags & MEM_Str ){ #ifndef SQLITE4_OMIT_UTF16 u8 enc = ENC(db); if( enc!=SQLITE4_UTF8 ){ Mem utf8; memset(&utf8, 0, sizeof(utf8)); utf8.db = db; sqlite4VdbeMemSetStr(&utf8, pVar->z, pVar->n, enc, SQLITE4_STATIC, 0); sqlite4VdbeChangeEncoding(&utf8, SQLITE4_UTF8); sqlite4XPrintf(&out, "'%.*q'", utf8.n, utf8.z); sqlite4VdbeMemRelease(&utf8); }else #endif { sqlite4XPrintf(&out, "'%.*q'", pVar->n, pVar->z); |
︙ | ︙ |
Changes to test/test_func.c.
︙ | ︙ | |||
65 66 67 68 69 70 71 | } assert( n<sizeof(zBuf) ); sqlite4_randomness(pEnv, n, zBuf); for(i=0; i<n; i++){ zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)]; } zBuf[n] = 0; | | | | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | } assert( n<sizeof(zBuf) ); sqlite4_randomness(pEnv, n, zBuf); for(i=0; i<n; i++){ zBuf[i] = zSrc[zBuf[i]%(sizeof(zSrc)-1)]; } zBuf[n] = 0; sqlite4_result_text(context, (char*)zBuf, n, SQLITE4_TRANSIENT, 0); } /* ** The following two SQL functions are used to test returning a text ** result with a destructor. Function 'test_destructor' takes one argument ** and returns the same argument interpreted as TEXT. A destructor is ** passed with the sqlite4_result_text() call. ** ** SQL function 'test_destructor_count' returns the number of outstanding ** allocations made by 'test_destructor'; ** ** WARNING: Not threadsafe. */ static int test_destructor_count_var = 0; static void destructor(void *pNotUsed, void *p){ char *zVal = (char *)p; assert(zVal); zVal--; sqlite4_free(0, zVal); test_destructor_count_var--; } static void test_destructor( |
︙ | ︙ | |||
107 108 109 110 111 112 113 | if( !zVal ){ return; } zVal[len+1] = 0; zVal[len+2] = 0; zVal++; memcpy(zVal, sqlite4_value_text(argv[0]), len); | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | if( !zVal ){ return; } zVal[len+1] = 0; zVal[len+2] = 0; zVal++; memcpy(zVal, sqlite4_value_text(argv[0]), len); sqlite4_result_text(pCtx, zVal, -1, destructor, 0); } #ifndef SQLITE4_OMIT_UTF16 static void test_destructor16( sqlite4_context *pCtx, int nArg, sqlite4_value **argv ){ |
︙ | ︙ | |||
130 131 132 133 134 135 136 | if( !zVal ){ return; } zVal[len+1] = 0; zVal[len+2] = 0; zVal++; memcpy(zVal, sqlite4_value_text16(argv[0]), len); | | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | if( !zVal ){ return; } zVal[len+1] = 0; zVal[len+2] = 0; zVal++; memcpy(zVal, sqlite4_value_text16(argv[0]), len); sqlite4_result_text16(pCtx, zVal, -1, destructor, 0); } #endif static void test_destructor_count( sqlite4_context *pCtx, int nArg, sqlite4_value **argv ){ |
︙ | ︙ | |||
163 164 165 166 167 168 169 | #ifndef SQLITE4_OMIT_UTF16 const void *z; sqlite4 * db = sqlite4_context_db_handle(ctx); sqlite4_aggregate_context(ctx, 2048); sqlite4BeginBenignMalloc(); z = sqlite4_errmsg16(db); sqlite4EndBenignMalloc(); | | | > > > | > | > | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 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 | #ifndef SQLITE4_OMIT_UTF16 const void *z; sqlite4 * db = sqlite4_context_db_handle(ctx); sqlite4_aggregate_context(ctx, 2048); sqlite4BeginBenignMalloc(); z = sqlite4_errmsg16(db); sqlite4EndBenignMalloc(); sqlite4_result_text16(ctx, z, -1, SQLITE4_TRANSIENT, 0); #endif } /* ** Routines for testing the sqlite4_get_auxdata() and sqlite4_set_auxdata() ** interface. ** ** The test_auxdata() SQL function attempts to register each of its arguments ** as auxiliary data. If there are no prior registrations of aux data for ** that argument (meaning the argument is not a constant or this is its first ** call) then the result for that argument is 0. If there is a prior ** registration, the result for that argument is 1. The overall result ** is the individual argument results separated by spaces. */ static void free_test_auxdata(void *pEnv, void *p){ sqlite4_free((sqlite4_env*)pEnv, p); } static void test_auxdata( sqlite4_context *pCtx, int nArg, sqlite4_value **argv ){ int i; char *zRet = testContextMalloc(pCtx, nArg*2); sqlite4_env *pEnv; if( !zRet ) return; memset(zRet, 0, nArg*2); for(i=0; i<nArg; i++){ char const *z = (char*)sqlite4_value_text(argv[i]); if( z ){ int n; char *zAux = sqlite4_get_auxdata(pCtx, i); if( zAux ){ zRet[i*2] = '1'; assert( strcmp(zAux,z)==0 ); }else { zRet[i*2] = '0'; } n = strlen(z) + 1; zAux = testContextMalloc(pCtx, n); if( zAux ){ memcpy(zAux, z, n); sqlite4_set_auxdata(pCtx, i, zAux, free_test_auxdata, sqlite4_context_env(pCtx)); } zRet[i*2+1] = ' '; } } sqlite4_result_text(pCtx, zRet, 2*nArg-1, free_test_auxdata, sqlite4_context_env(pCtx)); } /* ** A function to test error reporting from user functions. This function ** returns a copy of its first argument as the error message. If the ** second argument exists, it becomes the error code. */ |
︙ | ︙ | |||
230 231 232 233 234 235 236 | sqlite4_result_error_code(pCtx, sqlite4_value_int(argv[1])); } } /* A counter object with its destructor. Used by counterFunc() below. */ struct counterObject { int cnt; sqlite4_env *pEnv; }; | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | sqlite4_result_error_code(pCtx, sqlite4_value_int(argv[1])); } } /* A counter object with its destructor. Used by counterFunc() below. */ struct counterObject { int cnt; sqlite4_env *pEnv; }; void counterFree(void *NotUsed, void *x){ struct counterObject *p = (struct counterObject*)x; sqlite4_free(p->pEnv, p); } /* ** Implementation of the counter(X) function. If X is an integer ** constant, then the first invocation will return X. The second X+1. |
︙ | ︙ | |||
256 257 258 259 260 261 262 | pCounter = sqlite4_malloc(sqlite4_context_env(pCtx), sizeof(*pCounter) ); if( pCounter==0 ){ sqlite4_result_error_nomem(pCtx); return; } pCounter->cnt = sqlite4_value_int(argv[0]); pCounter->pEnv = sqlite4_context_env(pCtx); | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | pCounter = sqlite4_malloc(sqlite4_context_env(pCtx), sizeof(*pCounter) ); if( pCounter==0 ){ sqlite4_result_error_nomem(pCtx); return; } pCounter->cnt = sqlite4_value_int(argv[0]); pCounter->pEnv = sqlite4_context_env(pCtx); sqlite4_set_auxdata(pCtx, 0, pCounter, counterFree, 0); }else{ pCounter->cnt++; } sqlite4_result_int(pCtx, pCounter->cnt); } |
︙ | ︙ | |||
319 320 321 322 323 324 325 | } if( rc ){ char *zErr; sqlite4_env *pEnv = sqlite4_context_env(pCtx); assert( pStmt==0 ); zErr = sqlite4_mprintf(pEnv, "sqlite4_prepare() error: %s", sqlite4_errmsg(db)); | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | } if( rc ){ char *zErr; sqlite4_env *pEnv = sqlite4_context_env(pCtx); assert( pStmt==0 ); zErr = sqlite4_mprintf(pEnv, "sqlite4_prepare() error: %s", sqlite4_errmsg(db)); sqlite4_result_text(pCtx, zErr, -1, SQLITE4_DYNAMIC, 0); sqlite4_result_error_code(pCtx, rc); } } /* ** convert one character from hex to binary |
︙ | ︙ | |||
372 373 374 375 376 377 378 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); | | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); sqlite4_result_text16be(pCtx, zOut, n/2, SQLITE4_DYNAMIC, 0); } } #endif /* ** hex_to_utf8(HEX) ** |
︙ | ︙ | |||
399 400 401 402 403 404 405 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); | | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); sqlite4_result_text(pCtx, zOut, n/2, SQLITE4_DYNAMIC, 0); } } /* ** hex_to_utf16le(HEX) ** ** Convert the input string from HEX into binary. Then return the |
︙ | ︙ | |||
426 427 428 429 430 431 432 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | n = sqlite4_value_bytes(argv[0]); zIn = (const char*)sqlite4_value_text(argv[0]); zOut = sqlite4_malloc(sqlite4_context_env(pCtx), n/2 ); if( zOut==0 ){ sqlite4_result_error_nomem(pCtx); }else{ testHexToBin(zIn, zOut); sqlite4_result_text16le(pCtx, zOut, n/2, SQLITE4_DYNAMIC, 0); } } #endif static int registerTestFunctions(sqlite4 *db){ static const struct { char *zName; |
︙ | ︙ |
Changes to test/test_main.c.
︙ | ︙ | |||
682 683 684 685 686 687 688 | sqlite4_value **argv ){ int i; for(i=0; i<argc; i++){ if( SQLITE4_NULL!=sqlite4_value_type(argv[i]) ){ int n = sqlite4_value_bytes(argv[i]); sqlite4_result_text(context, (char*)sqlite4_value_text(argv[i]), | | | | | 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 | sqlite4_value **argv ){ int i; for(i=0; i<argc; i++){ if( SQLITE4_NULL!=sqlite4_value_type(argv[i]) ){ int n = sqlite4_value_bytes(argv[i]); sqlite4_result_text(context, (char*)sqlite4_value_text(argv[i]), n, SQLITE4_TRANSIENT, 0); break; } } } /* ** These are test functions. hex8() interprets its argument as ** UTF8 and returns a hex encoding. hex16le() interprets its argument ** as UTF16le and returns a hex encoding. */ static void hex8Func(sqlite4_context *p, int argc, sqlite4_value **argv){ const unsigned char *z; int i; char zBuf[200]; z = sqlite4_value_text(argv[0]); for(i=0; i<sizeof(zBuf)/2 - 2 && z[i]; i++){ sprintf(&zBuf[i*2], "%02x", z[i]&0xff); } zBuf[i*2] = 0; sqlite4_result_text(p, (char*)zBuf, -1, SQLITE4_TRANSIENT, 0); } #ifndef SQLITE4_OMIT_UTF16 static void hex16Func(sqlite4_context *p, int argc, sqlite4_value **argv){ const unsigned short int *z; int i; char zBuf[400]; z = sqlite4_value_text16(argv[0]); for(i=0; i<sizeof(zBuf)/4 - 4 && z[i]; i++){ sprintf(&zBuf[i*4], "%04x", z[i]&0xff); } zBuf[i*4] = 0; sqlite4_result_text(p, (char*)zBuf, -1, SQLITE4_TRANSIENT, 0); } #endif /* ** A structure into which to accumulate text. */ struct dstr { |
︙ | ︙ | |||
787 788 789 790 791 792 793 | sqlite4_value **argv ){ struct dstr x; memset(&x, 0, sizeof(x)); (void)sqlite4_exec((sqlite4*)sqlite4_user_data(context), (char*)sqlite4_value_text(argv[0]), execFuncCallback, &x, 0); | | | 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 | sqlite4_value **argv ){ struct dstr x; memset(&x, 0, sizeof(x)); (void)sqlite4_exec((sqlite4*)sqlite4_user_data(context), (char*)sqlite4_value_text(argv[0]), execFuncCallback, &x, 0); sqlite4_result_text(context, x.z, x.nUsed, SQLITE4_TRANSIENT, 0); sqlite4_free(0, x.z); } /* ** Implementation of tkt2213func(), a scalar function that takes exactly ** one argument. It has two interesting features: ** |
︙ | ︙ | |||
827 828 829 830 831 832 833 | zText3 = sqlite4_value_text(argv[0]); if( zText1!=zText2 || zText2!=zText3 ){ sqlite4_result_error(context, "tkt2213 is not fixed", -1); }else{ char *zCopy = (char *)sqlite4_malloc(sqlite4_context_env(context),nText); memcpy(zCopy, zText1, nText); | | | 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 | zText3 = sqlite4_value_text(argv[0]); if( zText1!=zText2 || zText2!=zText3 ){ sqlite4_result_error(context, "tkt2213 is not fixed", -1); }else{ char *zCopy = (char *)sqlite4_malloc(sqlite4_context_env(context),nText); memcpy(zCopy, zText1, nText); sqlite4_result_text(context, zCopy, nText, SQLITE4_DYNAMIC, 0); } } /* ** The following SQL function takes 4 arguments. The 2nd and ** 4th argument must be one of these strings: 'text', 'text16', ** or 'blob' corresponding to API functions |
︙ | ︙ | |||
965 966 967 968 969 970 971 | /* Use the sqlite4_create_function16() API here. Mainly for fun, but also ** because it is not tested anywhere else. */ if( rc==SQLITE4_OK ){ const void *zUtf16; sqlite4_value *pVal; sqlite4_mutex_enter(db->mutex); pVal = sqlite4ValueNew(db); | | > | 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 | /* Use the sqlite4_create_function16() API here. Mainly for fun, but also ** because it is not tested anywhere else. */ if( rc==SQLITE4_OK ){ const void *zUtf16; sqlite4_value *pVal; sqlite4_mutex_enter(db->mutex); pVal = sqlite4ValueNew(db); sqlite4ValueSetStr(pVal, -1, "x_sqlite_exec", SQLITE4_UTF8, SQLITE4_STATIC, 0); zUtf16 = sqlite4ValueText(pVal, SQLITE4_UTF16NATIVE); if( db->mallocFailed ){ rc = SQLITE4_NOMEM; }else{ rc = sqlite4_create_function16(db, zUtf16, 1, SQLITE4_UTF16, db, sqlite4ExecFunc, 0, 0); } |
︙ | ︙ | |||
1710 1711 1712 1713 1714 1715 1716 | if( zArg0 ){ if( 0==sqlite4_stricmp(zArg0, "int") ){ sqlite4_result_int(context, sqlite4_value_int(argv[1])); }else if( sqlite4_stricmp(zArg0,"int64")==0 ){ sqlite4_result_int64(context, sqlite4_value_int64(argv[1])); }else if( sqlite4_stricmp(zArg0,"string")==0 ){ sqlite4_result_text(context, (char*)sqlite4_value_text(argv[1]), -1, | | | 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 | if( zArg0 ){ if( 0==sqlite4_stricmp(zArg0, "int") ){ sqlite4_result_int(context, sqlite4_value_int(argv[1])); }else if( sqlite4_stricmp(zArg0,"int64")==0 ){ sqlite4_result_int64(context, sqlite4_value_int64(argv[1])); }else if( sqlite4_stricmp(zArg0,"string")==0 ){ sqlite4_result_text(context, (char*)sqlite4_value_text(argv[1]), -1, SQLITE4_TRANSIENT, 0); }else if( sqlite4_stricmp(zArg0,"double")==0 ){ sqlite4_result_double(context, sqlite4_value_double(argv[1])); }else if( sqlite4_stricmp(zArg0,"null")==0 ){ sqlite4_result_null(context); }else if( sqlite4_stricmp(zArg0,"value")==0 ){ sqlite4_result_value(context, argv[sqlite4_value_int(argv[1])]); }else{ |
︙ | ︙ | |||
2096 2097 2098 2099 2100 2101 2102 | return TCL_ERROR; } if( getStmtPointer(interp, argv[1], &pStmt) ) return TCL_ERROR; if( Tcl_GetInt(interp, argv[2], &idx) ) return TCL_ERROR; if( strcmp(argv[4],"null")==0 ){ rc = sqlite4_bind_null(pStmt, idx); }else if( strcmp(argv[4],"static")==0 ){ | | | | | | 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 | return TCL_ERROR; } if( getStmtPointer(interp, argv[1], &pStmt) ) return TCL_ERROR; if( Tcl_GetInt(interp, argv[2], &idx) ) return TCL_ERROR; if( strcmp(argv[4],"null")==0 ){ rc = sqlite4_bind_null(pStmt, idx); }else if( strcmp(argv[4],"static")==0 ){ rc = sqlite4_bind_text(pStmt, idx, sqlite_static_bind_value, -1, 0, 0); }else if( strcmp(argv[4],"static-nbytes")==0 ){ rc = sqlite4_bind_text(pStmt, idx, sqlite_static_bind_value, sqlite_static_bind_nbyte, 0, 0); }else if( strcmp(argv[4],"normal")==0 ){ rc = sqlite4_bind_text(pStmt, idx, argv[3], -1, SQLITE4_TRANSIENT, 0); }else if( strcmp(argv[4],"blob10")==0 ){ rc = sqlite4_bind_text(pStmt, idx, "abc\000xyz\000pq", 10,SQLITE4_STATIC,0); }else{ Tcl_AppendResult(interp, "4th argument should be " "\"null\" or \"static\" or \"normal\"", 0); return TCL_ERROR; } if( sqlite4TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR; if( rc ){ |
︙ | ︙ | |||
2183 2184 2185 2186 2187 2188 2189 | default: assert(0); } sqlite4BeginBenignMalloc(pEnv); pVal = sqlite4ValueNew(0); if( pVal ){ | | | | 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 | default: assert(0); } sqlite4BeginBenignMalloc(pEnv); pVal = sqlite4ValueNew(0); if( pVal ){ sqlite4ValueSetStr(pVal, nA, zA, encin, SQLITE4_STATIC, 0); n = sqlite4_value_bytes(pVal); Tcl_ListObjAppendElement(i,pX, Tcl_NewStringObj((char*)sqlite4_value_text(pVal),n)); sqlite4ValueSetStr(pVal, nB, zB, encin, SQLITE4_STATIC, 0); n = sqlite4_value_bytes(pVal); Tcl_ListObjAppendElement(i,pX, Tcl_NewStringObj((char*)sqlite4_value_text(pVal),n)); sqlite4ValueFree(pVal); } sqlite4EndBenignMalloc(pEnv); |
︙ | ︙ | |||
2385 2386 2387 2388 2389 2390 2391 | pX = Tcl_NewStringObj("test_function", -1); Tcl_IncrRefCount(pX); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-8", -1)); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj((char*)sqlite4_value_text(argv[0]), -1)); Tcl_EvalObjEx(interp, pX, 0); Tcl_DecrRefCount(pX); | | > | | | | > | | | | | 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 | pX = Tcl_NewStringObj("test_function", -1); Tcl_IncrRefCount(pX); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-8", -1)); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj((char*)sqlite4_value_text(argv[0]), -1)); Tcl_EvalObjEx(interp, pX, 0); Tcl_DecrRefCount(pX); sqlite4_result_text(pCtx, Tcl_GetStringResult(interp), -1, SQLITE4_TRANSIENT, 0); pVal = sqlite4ValueNew(0); sqlite4ValueSetStr(pVal, -1, Tcl_GetStringResult(interp), SQLITE4_UTF8, SQLITE4_STATIC, 0); sqlite4_result_text16be(pCtx, sqlite4_value_text16be(pVal), -1, SQLITE4_TRANSIENT, 0); sqlite4ValueFree(pVal); } static void test_function_utf16le( sqlite4_context *pCtx, int nArg, sqlite4_value **argv ){ Tcl_Interp *interp; Tcl_Obj *pX; sqlite4_value *pVal; interp = (Tcl_Interp *)sqlite4_user_data(pCtx); pX = Tcl_NewStringObj("test_function", -1); Tcl_IncrRefCount(pX); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16LE", -1)); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj((char*)sqlite4_value_text(argv[0]), -1)); Tcl_EvalObjEx(interp, pX, 0); Tcl_DecrRefCount(pX); pVal = sqlite4ValueNew(0); sqlite4ValueSetStr(pVal, -1, Tcl_GetStringResult(interp), SQLITE4_UTF8, SQLITE4_STATIC, 0); sqlite4_result_text(pCtx, (char*)sqlite4_value_text(pVal), -1, SQLITE4_TRANSIENT, 0); sqlite4ValueFree(pVal); } static void test_function_utf16be( sqlite4_context *pCtx, int nArg, sqlite4_value **argv ){ Tcl_Interp *interp; Tcl_Obj *pX; sqlite4_value *pVal; interp = (Tcl_Interp *)sqlite4_user_data(pCtx); pX = Tcl_NewStringObj("test_function", -1); Tcl_IncrRefCount(pX); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16BE", -1)); Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj((char*)sqlite4_value_text(argv[0]), -1)); Tcl_EvalObjEx(interp, pX, 0); Tcl_DecrRefCount(pX); pVal = sqlite4ValueNew(0); sqlite4ValueSetStr(pVal, -1, Tcl_GetStringResult(interp), SQLITE4_UTF8, SQLITE4_STATIC, 0); sqlite4_result_text16(pCtx, sqlite4_value_text16le(pVal), -1, SQLITE4_TRANSIENT, 0); sqlite4_result_text16be(pCtx, sqlite4_value_text16le(pVal), -1, SQLITE4_TRANSIENT, 0); sqlite4_result_text16le(pCtx, sqlite4_value_text16le(pVal), -1, SQLITE4_TRANSIENT, 0); sqlite4ValueFree(pVal); } #endif /* SQLITE4_OMIT_UTF16 */ static int test_function( void * clientData, Tcl_Interp *interp, int objc, |
︙ | ︙ | |||
2784 2785 2786 2787 2788 2789 2790 | } if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[2], &idx) ) return TCL_ERROR; value = (char*)Tcl_GetByteArrayFromObj(objv[3], &bytes); if( Tcl_GetIntFromObj(interp, objv[4], &bytes) ) return TCL_ERROR; | | | 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 | } if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[2], &idx) ) return TCL_ERROR; value = (char*)Tcl_GetByteArrayFromObj(objv[3], &bytes); if( Tcl_GetIntFromObj(interp, objv[4], &bytes) ) return TCL_ERROR; rc = sqlite4_bind_text(pStmt, idx, value, bytes, SQLITE4_TRANSIENT, 0); if( sqlite4TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR; if( rc!=SQLITE4_OK ){ Tcl_AppendResult(interp, sqlite4TestErrorName(rc), 0); return TCL_ERROR; } return TCL_OK; |
︙ | ︙ | |||
2832 2833 2834 2835 2836 2837 2838 | } if( getStmtPointer(interp, Tcl_GetString(oStmt), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, oN, &idx) ) return TCL_ERROR; value = (char*)Tcl_GetByteArrayFromObj(oString, 0); if( Tcl_GetIntFromObj(interp, oBytes, &bytes) ) return TCL_ERROR; | | | 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 | } if( getStmtPointer(interp, Tcl_GetString(oStmt), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, oN, &idx) ) return TCL_ERROR; value = (char*)Tcl_GetByteArrayFromObj(oString, 0); if( Tcl_GetIntFromObj(interp, oBytes, &bytes) ) return TCL_ERROR; rc = sqlite4_bind_text16(pStmt, idx, (void *)value, bytes, xDel, 0); if( sqlite4TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR; if( rc!=SQLITE4_OK ){ Tcl_AppendResult(interp, sqlite4TestErrorName(rc), 0); return TCL_ERROR; } #endif /* SQLITE4_OMIT_UTF16 */ |
︙ | ︙ | |||
2879 2880 2881 2882 2883 2884 2885 | } if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[2], &idx) ) return TCL_ERROR; value = Tcl_GetString(objv[3]); if( Tcl_GetIntFromObj(interp, objv[4], &bytes) ) return TCL_ERROR; | | | 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 | } if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; if( Tcl_GetIntFromObj(interp, objv[2], &idx) ) return TCL_ERROR; value = Tcl_GetString(objv[3]); if( Tcl_GetIntFromObj(interp, objv[4], &bytes) ) return TCL_ERROR; rc = sqlite4_bind_blob(pStmt, idx, value, bytes, xDestructor, 0); if( sqlite4TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR; if( rc!=SQLITE4_OK ){ return TCL_ERROR; } return TCL_OK; } |
︙ | ︙ |
Changes to test/test_utf.c.
︙ | ︙ | |||
112 113 114 115 116 117 118 | } if( pEnc->enc==SQLITE4_UTF16 ){ return SQLITE4_UTF16NATIVE; } return pEnc->enc; } | | > > | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | } if( pEnc->enc==SQLITE4_UTF16 ){ return SQLITE4_UTF16NATIVE; } return pEnc->enc; } static void freeStr(void *pEnv, void *pStr){ sqlite4_free((sqlite4_env*)pEnv, pStr); } /* ** Usage: test_translate <string/blob> <from enc> <to enc> ?<transient>? ** */ static int test_translate( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ u8 enc_from; u8 enc_to; sqlite4_value *pVal; char *z; int len; void (*xDel)(void*,void*) = SQLITE4_STATIC; if( objc!=4 && objc!=5 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", Tcl_GetStringFromObj(objv[0], 0), " <string/blob> <from enc> <to enc>", 0 ); return TCL_ERROR; |
︙ | ︙ | |||
155 156 157 158 159 160 161 | pVal = sqlite4ValueNew(0); if( enc_from==SQLITE4_UTF8 ){ z = Tcl_GetString(objv[1]); if( objc==5 ){ z = sqlite4_mprintf(0, "%s", z); } | | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | pVal = sqlite4ValueNew(0); if( enc_from==SQLITE4_UTF8 ){ z = Tcl_GetString(objv[1]); if( objc==5 ){ z = sqlite4_mprintf(0, "%s", z); } sqlite4ValueSetStr(pVal, -1, z, enc_from, xDel, 0); }else{ z = (char*)Tcl_GetByteArrayFromObj(objv[1], &len); if( objc==5 ){ char *zTmp = z; z = sqlite4_malloc(0, len); memcpy(z, zTmp, len); } sqlite4ValueSetStr(pVal, -1, z, enc_from, xDel, 0); } z = (char *)sqlite4ValueText(pVal, enc_to); len = sqlite4ValueBytes(pVal, enc_to) + (enc_to==SQLITE4_UTF8?1:2); Tcl_SetObjResult(interp, Tcl_NewByteArrayObj((u8*)z, len)); sqlite4ValueFree(pVal); |
︙ | ︙ |