Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1403) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f71844bc27c9fc799af3337daf2a2123 |
User & Date: | danielk1977 2004-05-19 10:36:44.000 |
Context
2004-05-19
| ||
11:24 | Variable name change: azVar to apVar. (CVS 1404) (check-in: 45169ce015 user: drh tags: trunk) | |
10:36 | Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1403) (check-in: f71844bc27 user: danielk1977 tags: trunk) | |
10:35 | Tests for text encoding conversion functions. Also new sqlite3_bindXX APIs. (CVS 1402) (check-in: a0f3f6ed23 user: danielk1977 tags: trunk) | |
Changes
Changes to src/vdbeInt.h.
︙ | ︙ | |||
268 269 270 271 272 273 274 | int nCursor; /* Number of slots in apCsr[] */ Cursor **apCsr; /* One element of this array for each open cursor */ Sorter *pSort; /* A linked list of objects to be sorted */ FILE *pFile; /* At most one open file handler */ int nField; /* Number of file fields */ char **azField; /* Data for each file field */ int nVar; /* Number of entries in azVariable[] */ | | < < | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | int nCursor; /* Number of slots in apCsr[] */ Cursor **apCsr; /* One element of this array for each open cursor */ Sorter *pSort; /* A linked list of objects to be sorted */ FILE *pFile; /* At most one open file handler */ int nField; /* Number of file fields */ char **azField; /* Data for each file field */ int nVar; /* Number of entries in azVariable[] */ Mem *azVar; /* Values for the OP_Variable opcode. */ char *zLine; /* A single line from the input file */ int nLineAlloc; /* Number of spaces allocated for zLine */ int magic; /* Magic number for sanity checking */ int nMem; /* Number of memory locations currently allocated */ Mem *aMem; /* The memory locations */ Agg agg; /* Aggregate information */ int nSet; /* Number of sets allocated */ |
︙ | ︙ |
Changes to src/vdbeaux.c.
︙ | ︙ | |||
612 613 614 615 616 617 618 | */ if( p->aStack==0 ){ p->nVar = nVar; assert( nVar>=0 ); n = isExplain ? 10 : p->nOp; p->aStack = sqliteMalloc( n*(sizeof(p->aStack[0]) + 2*sizeof(char*)) /* aStack and zArgv */ | | | | | > | 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 | */ if( p->aStack==0 ){ p->nVar = nVar; assert( nVar>=0 ); n = isExplain ? 10 : p->nOp; p->aStack = sqliteMalloc( n*(sizeof(p->aStack[0]) + 2*sizeof(char*)) /* aStack and zArgv */ + p->nVar*sizeof(Mem) /* azVar */ ); p->zArgv = (char**)&p->aStack[n]; p->azColName = (char**)&p->zArgv[n]; p->azVar = (Mem *)&p->azColName[n]; for(n=0; n<p->nVar; n++){ p->azVar[n].flags = MEM_Null; } } sqlite3HashInit(&p->agg.hash, SQLITE_HASH_BINARY, 0); p->agg.pSearch = 0; #ifdef MEMORY_DEBUG if( sqlite3OsFileExists("vdbe_trace") ){ p->trace = stdout; |
︙ | ︙ | |||
936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 | sqlite3_close(db); } if( rc==SQLITE_SCHEMA ){ sqlite3ResetInternalSchema(db, 0); } return rc; } /* ** Set the values of all variables. Variable $1 in the original SQL will ** be the string azValue[0]. $2 will have the value azValue[1]. And ** so forth. If a value is out of range (for example $3 when nValue==2) ** then its value will be NULL. ** ** This routine overrides any prior call. */ int sqlite3_bind(sqlite_vm *pVm, int i, const char *zVal, int len, int copy){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < | < | 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 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 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 | sqlite3_close(db); } if( rc==SQLITE_SCHEMA ){ sqlite3ResetInternalSchema(db, 0); } return rc; } /* ** Unbind the value bound to variable $i in virtual machine p. This is the ** the same as binding a NULL value to the column. */ static int vdbeUnbind(Vdbe *p, int i){ Mem *pVar; if( p->magic!=VDBE_MAGIC_RUN || p->pc!=0 ){ return SQLITE_MISUSE; } if( i<1 || i>p->nVar ){ return SQLITE_RANGE; } i--; pVar = &p->azVar[i]; if( pVar->flags&MEM_Dyn ){ sqliteFree(pVar->z); } pVar->flags = MEM_Null; return SQLITE_OK; } /* ** This routine is used to bind text or blob data to an SQL variable (a ?). ** It may also be used to bind a NULL value, by setting zVal to 0. */ static int vdbeBindBlob( Vdbe *p, /* Virtual machine */ int i, /* Var number to bind (numbered from 1 upward) */ const char *zVal, /* Pointer to blob of data */ int bytes, /* Number of bytes to copy */ int copy, /* True to copy the memory, false to copy a pointer */ int flags /* Valid combination of MEM_Blob, MEM_Str, MEM_UtfXX */ ){ Mem *pVar; vdbeUnbind(p, i); pVar = &p->azVar[i-1]; if( zVal ){ pVar->n = bytes; pVar->flags = flags; if( !copy ){ pVar->z = (char *)zVal; pVar->flags |= MEM_Static; }else{ if( bytes>NBFS ){ pVar->z = (char *)sqliteMalloc(bytes); if( !pVar->z ){ return SQLITE_NOMEM; } pVar->flags |= MEM_Dyn; }else{ pVar->z = pVar->zShort; pVar->flags |= MEM_Short; } memcpy(pVar->z, zVal, bytes); } } return SQLITE_OK; } int sqlite3_bind_int64(sqlite3_stmt *p, int i, long long int iValue){ int rc; Vdbe *v = (Vdbe *)p; rc = vdbeUnbind(v, i); if( rc==SQLITE_OK ){ Mem *pVar = &v->azVar[i-1]; pVar->flags = MEM_Int; pVar->i = iValue; } return SQLITE_OK; } int sqlite3_bind_int32(sqlite3_stmt *p, int i, int iValue){ return sqlite3_bind_int64(p, i, (long long int)iValue); } int sqlite3_bind_double(sqlite3_stmt *p, int i, double iValue){ int rc; Vdbe *v = (Vdbe *)p; rc = vdbeUnbind(v, i); if( rc==SQLITE_OK ){ Mem *pVar = &v->azVar[i-1]; pVar->flags = MEM_Real; pVar->r = iValue; } return SQLITE_OK; } int sqlite3_bind_null(sqlite3_stmt* p, int i){ return vdbeUnbind((Vdbe *)p, i); } int sqlite3_bind_text( sqlite3_stmt *p, int i, const char *zData, int nData, int eCopy ){ if( zData && nData<0 ){ nData = strlen(zData)+1; } return vdbeBindBlob((Vdbe *)p, i, zData, nData, eCopy, MEM_Str|MEM_Utf8); } int sqlite3_bind_text16( sqlite3_stmt *p, int i, const void *zData, int nData, int eCopy ){ if( zData && nData<0 ){ char *z = (char *)zData; while( (*z)!=0 && (*(z+1))!=0 ) z+=2; nData = (z - (char *)zData) + 2; } /* FIX ME - MEM_Utf16le? */ return vdbeBindBlob((Vdbe *)p, i, zData, nData, eCopy, MEM_Str|MEM_Utf16le); } int sqlite3_bind_blob( sqlite3_stmt *p, int i, const void *zData, int nData, int eCopy ){ return vdbeBindBlob((Vdbe *)p, i, zData, nData, eCopy, MEM_Blob); } /* ** Set the values of all variables. Variable $1 in the original SQL will ** be the string azValue[0]. $2 will have the value azValue[1]. And ** so forth. If a value is out of range (for example $3 when nValue==2) ** then its value will be NULL. ** ** This routine overrides any prior call. */ int sqlite3_bind(sqlite_vm *pVm, int i, const char *zVal, int len, int copy){ return sqlite3_bind_text(pVm, i, zVal, len, copy); } /* ** Delete an entire VDBE. */ void sqlite3VdbeDelete(Vdbe *p){ int i; if( p==0 ) return; |
︙ | ︙ | |||
1003 1004 1005 1006 1007 1008 1009 | } for(i=0; i<p->nOp; i++){ if( p->aOp[i].p3type==P3_DYNAMIC ){ sqliteFree(p->aOp[i].p3); } } for(i=0; i<p->nVar; i++){ | > | > | 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 | } for(i=0; i<p->nOp; i++){ if( p->aOp[i].p3type==P3_DYNAMIC ){ sqliteFree(p->aOp[i].p3); } } for(i=0; i<p->nVar; i++){ if( p->azVar[i].flags&MEM_Dyn ){ sqliteFree(p->azVar[i].z); } } sqliteFree(p->aOp); sqliteFree(p->aLabel); sqliteFree(p->aStack); p->magic = VDBE_MAGIC_DEAD; sqliteFree(p); } |
︙ | ︙ |