Sync w/trunk, for .import fix.
FossilOrigin-Name: 861ab023be283782131df5ccd9eff50cf2f06f48f1ea7defd3f08177a3df5889
This commit is contained in:
larrybr
@@ -492,7 +492,7 @@ TCL_CSTR_LITERAL(static const char * const zDefineREPL = ){
|
||||
if {$trimmed eq "."} break
|
||||
set rc [catch {uplevel #0 $group} result]
|
||||
if {$rc == 0} {
|
||||
if {$result != "" && $interactive} {
|
||||
if {$result != "" && $::tcl_interactive} {
|
||||
puts $result
|
||||
}
|
||||
} elseif {$rc == 1} {
|
||||
@@ -501,7 +501,7 @@ TCL_CSTR_LITERAL(static const char * const zDefineREPL = ){
|
||||
return -code 2
|
||||
}
|
||||
}
|
||||
if {$interactive && $trimmed ne "."} {puts {}}
|
||||
if {$::tcl_interactive && $trimmed ne "."} {puts {}}
|
||||
read stdin 0
|
||||
if {[info exists save_interactive]} {
|
||||
set ::tcl_interactive $save_interactive
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
C Get\stclshext\smade\swith\sTk,\soptionally,\sand\smake\sunknown\swork\sas\sin\stclsh.
|
||||
D 2022-04-09T14:57:17.905
|
||||
C Sync\sw/trunk,\sfor\s.import\sfix.
|
||||
D 2022-04-09T19:39:58.635
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@@ -329,7 +329,7 @@ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
|
||||
F ext/misc/spellfix.c 94df9bbfa514a563c1484f684a2df3d128a2f7209a84ca3ca100c68a0163e29f
|
||||
F ext/misc/sqlar.c 0ace5d3c10fe736dc584bf1159a36b8e2e60fab309d310cd8a0eecd9036621b6
|
||||
F ext/misc/stmt.c 35063044a388ead95557e4b84b89c1b93accc2f1c6ddea3f9710e8486a7af94a
|
||||
F ext/misc/tclshext.c.in 026416fd5c1e84eb8c8e98edc9dcd826e3c0d32fd0883ab306829642867128e8
|
||||
F ext/misc/tclshext.c.in c29c3aa45cc477106aa6995308c8e1f8fe68e6ff4b10b2d906acefbbd62c4196
|
||||
F ext/misc/templatevtab.c 8a16a91a5ceaccfcbd6aaaa56d46828806e460dd194965b3f77bf38f14b942c4
|
||||
F ext/misc/totype.c fa4aedeb07f66169005dffa8de3b0a2b621779fd44f85c103228a42afa71853b
|
||||
F ext/misc/uint.c 053fed3bce2e89583afcd4bf804d75d659879bbcedac74d0fa9ed548839a030b
|
||||
@@ -502,7 +502,7 @@ F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1
|
||||
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
|
||||
F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad
|
||||
F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f
|
||||
F src/dbpage.c a70be9a4879ac5392673a1050d526a72b8b2f9938df7049f65348566a2637db3
|
||||
F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68
|
||||
F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
|
||||
F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce
|
||||
F src/expr.c 5e247a8dfabb92e9fd10b78a675dc5d25430433dfd9e316471b4447b548635ba
|
||||
@@ -555,13 +555,13 @@ F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
|
||||
F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
|
||||
F src/resolve.c 18d99e7146852d6064559561769fcca0743eb32b14a97da6dbed373a30ee0e76
|
||||
F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
|
||||
F src/select.c d6c04eb93395024af80f61a8c278a33c2a0333aeb7d57bb6aa737a6f1c4af4b8
|
||||
F src/shell.c.in 8e2ad2912ae381786653ce9db04522f8058873d690f434016ecda5a419c0cdc5
|
||||
F src/select.c 7c106b3f36d483242b0a9c696614cd53d6f29e1ac81da6a3f0e9ea92f4211cc3
|
||||
F src/shell.c.in 3984e1de9e70357ea0a017409f4421eacf94175a30969d68f6cc135a4c1fb9f9
|
||||
F src/shext_linkage.h 88a3f215fdb090fcc3b3577a05bafd234f1a556bad3f2f4ac990a177aebf4b2c
|
||||
F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
|
||||
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
|
||||
F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
|
||||
F src/sqliteInt.h 8262a5a484ffc0c0899537c9d99fff381f2d76061e256592a342bc098860a6ec
|
||||
F src/sqliteInt.h 364699d46b6cd2fbcaedfb907cedd42c8ed6e32a671f7f72edb257cad861c40b
|
||||
F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
|
||||
F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
|
||||
F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
|
||||
@@ -644,10 +644,10 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
|
||||
F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
|
||||
F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
|
||||
F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
|
||||
F src/where.c a2483d4fe7cde88638cd3140dd5d6ee3dc0c80d3b3fe20322a8d08dc451f97ae
|
||||
F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
|
||||
F src/wherecode.c 6292d7bf2d751b1ce68139a70e5468dd6615a9a9dab5b5e61c0053836723bb7a
|
||||
F src/whereexpr.c 612f58f5f6e3e3bb94d10e2c56672ade8bbf94d4a928d3edb4e84e2ed3c00dca
|
||||
F src/where.c 929ac88a1b65bcdef7e05a0b87b13a0c55cd3d5d3bc27ec81a6f37eaca13e5fe
|
||||
F src/whereInt.h 41ce0a8c0368372d8422e420e05a1e037624ce52fae139c3c19538ee491fb4c0
|
||||
F src/wherecode.c b7bc24b150d6a47c48844f89c3bf6d8f694780acb71768c83b9bec8a729e0d81
|
||||
F src/whereexpr.c 2ce4ff64b80fce0a0f7579f5ec2b953f10952a3410c441564e12b650ea8c2aba
|
||||
F src/window.c 42a71595263dbd8ef8248218e4fc7d4b5ddccece52146ad48e079342d93f6f8f
|
||||
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
|
||||
F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
|
||||
@@ -1398,7 +1398,7 @@ F test/shell1.test 9401659c4f7319586ddd36aac15aaadff0092caa786589fc20ad069fc2cb1
|
||||
F test/shell2.test fc6bb55f5ceaaffa284cb994aa00fd56f7ead09949c9db01c3846d65a76a7748
|
||||
F test/shell3.test 4ddea2bd182e7e03249911b23ae249e7cb8a91cdc86e695198725affabe8ecd3
|
||||
F test/shell4.test b232688061cce531f42ec067f3b5760e31d12409e566e2ae230951036dd156f1
|
||||
F test/shell5.test 04b46462b3297de7195aaed99a0cd99fdb9f8de211a96abea46a81db55c5ef77
|
||||
F test/shell5.test 39d2cffb3c1c67456b2c42eb5e46bec1e3780c68a6d71bb156e012d3f53733c5
|
||||
F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b00d3
|
||||
F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
|
||||
F test/shell8.test 388471d16e4de767333107e30653983f186232c0e863f4490bb230419e830aae
|
||||
@@ -1951,8 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 0b3bb0e793f8c7fd79042322b7748a75d17a3c3d0752cfb0f2c544af49b1d6d6
|
||||
R fd77dc9b9d6010cf74b598e30b2c6a7a
|
||||
P 43eb311e517b79cde9e17c1a80baed8d13d9d943dd9ee44b31831159df8715fc 21e96600d90c1cda84777abe22a11058eba46c9faefeb05f8c31bc0e7fa84b19
|
||||
R 67ea5330fa92b3979fbd7e883fdffd1f
|
||||
U larrybr
|
||||
Z 41d0aa7cc99a4d24d4e075af36bc0e99
|
||||
Z b47b9cb62392429660769c050bed79ba
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
43eb311e517b79cde9e17c1a80baed8d13d9d943dd9ee44b31831159df8715fc
|
||||
861ab023be283782131df5ccd9eff50cf2f06f48f1ea7defd3f08177a3df5889
|
||||
+1
-1
@@ -156,7 +156,7 @@ static int dbpageBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
|
||||
){
|
||||
pIdxInfo->orderByConsumed = 1;
|
||||
}
|
||||
sqlite3VtabWriteAll(pIdxInfo);
|
||||
sqlite3VtabUsesAllSchemas(pIdxInfo);
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
||||
|
||||
+61
-14
@@ -204,6 +204,52 @@ static Select *findRightmost(Select *p){
|
||||
**
|
||||
** If an illegal or unsupported join type is seen, then still return
|
||||
** a join type, but put an error in the pParse structure.
|
||||
**
|
||||
** These are the valid join types:
|
||||
**
|
||||
**
|
||||
** pA pB pC Return Value
|
||||
** ------- ----- ----- ------------
|
||||
** CROSS - - JT_CROSS
|
||||
** INNER - - JT_INNER
|
||||
** LEFT - - JT_LEFT|JT_OUTER
|
||||
** LEFT OUTER - JT_LEFT|JT_OUTER
|
||||
** RIGHT - - JT_RIGHT|JT_OUTER
|
||||
** RIGHT OUTER - JT_RIGHT|JT_OUTER
|
||||
** FULL - - JT_LEFT|JT_RIGHT|JT_OUTER
|
||||
** FULL OUTER - JT_LEFT|JT_RIGHT|JT_OUTER
|
||||
** NATURAL INNER - JT_NATURAL|JT_INNER
|
||||
** NATURAL LEFT - JT_NATURAL|JT_LEFT|JT_OUTER
|
||||
** NATURAL LEFT OUTER JT_NATURAL|JT_LEFT|JT_OUTER
|
||||
** NATURAL RIGHT - JT_NATURAL|JT_RIGHT|JT_OUTER
|
||||
** NATURAL RIGHT OUTER JT_NATURAL|JT_RIGHT|JT_OUTER
|
||||
** NATURAL FULL - JT_NATURAL|JT_LEFT|JT_RIGHT
|
||||
** NATURAL FULL OUTER JT_NATRUAL|JT_LEFT|JT_RIGHT
|
||||
**
|
||||
** To preserve historical compatibly, SQLite also accepts a variety
|
||||
** of other non-standard and in many cases non-sensical join types.
|
||||
** This routine makes as much sense at it can from the nonsense join
|
||||
** type and returns a result. Examples of accepted nonsense join types
|
||||
** include but are not limited to:
|
||||
**
|
||||
** INNER CROSS JOIN -> same as JOIN
|
||||
** NATURAL CROSS JOIN -> same as NATURAL JOIN
|
||||
** OUTER LEFT JOIN -> same as LEFT JOIN
|
||||
** LEFT NATURAL JOIN -> same as NATURAL LEFT JOIN
|
||||
** LEFT RIGHT JOIN -> same as FULL JOIN
|
||||
** RIGHT OUTER FULL JOIN -> same as FULL JOIN
|
||||
** CROSS CROSS CROSS JOIN -> same as JOIN
|
||||
**
|
||||
** The only restrictions on the join type name are:
|
||||
**
|
||||
** * "INNER" cannot appear together with "OUTER", "LEFT", "RIGHT",
|
||||
** or "FULL".
|
||||
**
|
||||
** * "CROSS" cannot appear together with "OUTER", "LEFT", "RIGHT,
|
||||
** or "FULL".
|
||||
**
|
||||
** * If "OUTER" is present then there must also be one of
|
||||
** "LEFT", "RIGHT", or "FULL"
|
||||
*/
|
||||
int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
|
||||
int jointype = 0;
|
||||
@@ -216,13 +262,13 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
|
||||
u8 nChar; /* Length of the keyword in characters */
|
||||
u8 code; /* Join type mask */
|
||||
} aKeyword[] = {
|
||||
/* natural */ { 0, 7, JT_NATURAL },
|
||||
/* left */ { 6, 4, JT_LEFT|JT_OUTER },
|
||||
/* outer */ { 10, 5, JT_OUTER },
|
||||
/* right */ { 14, 5, JT_RIGHT|JT_OUTER },
|
||||
/* full */ { 19, 4, JT_LEFT|JT_RIGHT|JT_OUTER },
|
||||
/* inner */ { 23, 5, JT_INNER },
|
||||
/* cross */ { 28, 5, JT_INNER|JT_CROSS },
|
||||
/* (0) natural */ { 0, 7, JT_NATURAL },
|
||||
/* (1) left */ { 6, 4, JT_LEFT|JT_OUTER },
|
||||
/* (2) outer */ { 10, 5, JT_OUTER },
|
||||
/* (3) right */ { 14, 5, JT_RIGHT|JT_OUTER },
|
||||
/* (4) full */ { 19, 4, JT_LEFT|JT_RIGHT|JT_OUTER },
|
||||
/* (5) inner */ { 23, 5, JT_INNER },
|
||||
/* (6) cross */ { 28, 5, JT_INNER|JT_CROSS },
|
||||
};
|
||||
int i, j;
|
||||
apAll[0] = pA;
|
||||
@@ -245,16 +291,17 @@ int sqlite3JoinType(Parse *pParse, Token *pA, Token *pB, Token *pC){
|
||||
}
|
||||
if(
|
||||
(jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) ||
|
||||
(jointype & JT_ERROR)!=0
|
||||
(jointype & JT_ERROR)!=0 ||
|
||||
(jointype & (JT_OUTER|JT_LEFT|JT_RIGHT))==JT_OUTER
|
||||
){
|
||||
const char *zSp = " ";
|
||||
assert( pB!=0 );
|
||||
if( pC==0 ){ zSp++; }
|
||||
const char *zSp1 = " ";
|
||||
const char *zSp2 = " ";
|
||||
if( pB==0 ){ zSp1++; }
|
||||
if( pC==0 ){ zSp2++; }
|
||||
sqlite3ErrorMsg(pParse, "unknown or unsupported join type: "
|
||||
"%T %T%s%T", pA, pB, zSp, pC);
|
||||
"%T%s%T%s%T", pA, zSp1, pB, zSp2, pC);
|
||||
jointype = JT_INNER;
|
||||
}else if( (jointype & JT_OUTER)!=0
|
||||
&& (jointype & (JT_LEFT|JT_RIGHT))!=JT_LEFT ){
|
||||
}else if( (jointype & JT_RIGHT)!=0 ){
|
||||
sqlite3ErrorMsg(pParse,
|
||||
"RIGHT and FULL OUTER JOINs are not currently supported");
|
||||
jointype = JT_INNER;
|
||||
|
||||
+2
-2
@@ -7844,12 +7844,12 @@ SELECT\
|
||||
','||iif((cpos-1)%4>0, ' ', x'0a'||' '))\
|
||||
||')' AS ColsSpec \
|
||||
FROM (\
|
||||
SELECT cpos, printf('\"%w\"',printf('%.*s%s', nlen-chop,name,suff)) AS cname \
|
||||
SELECT cpos, printf('\"%w\"',printf('%!.*s%s', nlen-chop,name,suff)) AS cname \
|
||||
FROM ColNames ORDER BY cpos\
|
||||
)";
|
||||
static const char * const zRenamesDone =
|
||||
"SELECT group_concat("
|
||||
" printf('\"%w\" to \"%w\"',name,printf('%.*s%s', nlen-chop, name, suff)),"
|
||||
" printf('\"%w\" to \"%w\"',name,printf('%!.*s%s', nlen-chop, name, suff)),"
|
||||
" ','||x'0a')"
|
||||
"FROM ColNames WHERE suff<>'' OR chop!=0"
|
||||
;
|
||||
|
||||
+1
-1
@@ -5174,7 +5174,7 @@ int sqlite3VtabBegin(sqlite3 *, VTable *);
|
||||
FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
|
||||
#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
|
||||
&& !defined(SQLITE_OMIT_VIRTUALTABLE)
|
||||
void sqlite3VtabWriteAll(sqlite3_index_info*);
|
||||
void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
|
||||
#endif
|
||||
sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
|
||||
int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
|
||||
|
||||
+43
-11
@@ -253,6 +253,30 @@ Bitmask sqlite3WhereGetMask(WhereMaskSet *pMaskSet, int iCursor){
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Allocate memory that is automatically freed when pWInfo is freed.
|
||||
*/
|
||||
void *sqlite3WhereMalloc(WhereInfo *pWInfo, u64 nByte){
|
||||
WhereMemBlock *pBlock;
|
||||
pBlock = sqlite3DbMallocRawNN(pWInfo->pParse->db, nByte+sizeof(*pBlock));
|
||||
if( pBlock ){
|
||||
pBlock->pNext = pWInfo->pMemToFree;
|
||||
pBlock->sz = nByte;
|
||||
pWInfo->pMemToFree = pBlock;
|
||||
pBlock++;
|
||||
}
|
||||
return (void*)pBlock;
|
||||
}
|
||||
void *sqlite3WhereRealloc(WhereInfo *pWInfo, void *pOld, u64 nByte){
|
||||
void *pNew = sqlite3WhereMalloc(pWInfo, nByte);
|
||||
if( pNew && pOld ){
|
||||
WhereMemBlock *pOldBlk = (WhereMemBlock*)pOld;
|
||||
pOldBlk--;
|
||||
assert( pOldBlk->sz<nByte );
|
||||
memcpy(pNew, pOld, pOldBlk->sz);
|
||||
}
|
||||
return pNew;
|
||||
}
|
||||
|
||||
/*
|
||||
** Create a new mask for cursor iCursor.
|
||||
**
|
||||
@@ -2216,15 +2240,7 @@ static void whereLoopDelete(sqlite3 *db, WhereLoop *p){
|
||||
** Free a WhereInfo structure
|
||||
*/
|
||||
static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
|
||||
int i;
|
||||
assert( pWInfo!=0 );
|
||||
for(i=0; i<pWInfo->nLevel; i++){
|
||||
WhereLevel *pLevel = &pWInfo->a[i];
|
||||
if( pLevel->pWLoop && (pLevel->pWLoop->wsFlags & WHERE_IN_ABLE)!=0 ){
|
||||
assert( (pLevel->pWLoop->wsFlags & WHERE_MULTI_OR)==0 );
|
||||
sqlite3DbFree(db, pLevel->u.in.aInLoop);
|
||||
}
|
||||
}
|
||||
sqlite3WhereClauseClear(&pWInfo->sWC);
|
||||
while( pWInfo->pLoops ){
|
||||
WhereLoop *p = pWInfo->pLoops;
|
||||
@@ -2232,6 +2248,11 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
|
||||
whereLoopDelete(db, p);
|
||||
}
|
||||
assert( pWInfo->pExprMods==0 );
|
||||
while( pWInfo->pMemToFree ){
|
||||
WhereMemBlock *pNext = pWInfo->pMemToFree->pNext;
|
||||
sqlite3DbFreeNN(db, pWInfo->pMemToFree);
|
||||
pWInfo->pMemToFree = pNext;
|
||||
}
|
||||
sqlite3DbFreeNN(db, pWInfo);
|
||||
}
|
||||
|
||||
@@ -3788,15 +3809,26 @@ int sqlite3_vtab_distinct(sqlite3_index_info *pIdxInfo){
|
||||
&& !defined(SQLITE_OMIT_VIRTUALTABLE)
|
||||
/*
|
||||
** Cause the prepared statement that is associated with a call to
|
||||
** xBestIndex to open write transactions on all attached schemas.
|
||||
** xBestIndex to potentiall use all schemas. If the statement being
|
||||
** prepared is read-only, then just start read transactions on all
|
||||
** schemas. But if this is a write operation, start writes on all
|
||||
** schemas.
|
||||
**
|
||||
** This is used by the (built-in) sqlite_dbpage virtual table.
|
||||
*/
|
||||
void sqlite3VtabWriteAll(sqlite3_index_info *pIdxInfo){
|
||||
void sqlite3VtabUsesAllSchemas(sqlite3_index_info *pIdxInfo){
|
||||
HiddenIndexInfo *pHidden = (HiddenIndexInfo*)&pIdxInfo[1];
|
||||
Parse *pParse = pHidden->pParse;
|
||||
int nDb = pParse->db->nDb;
|
||||
int i;
|
||||
for(i=0; i<nDb; i++) sqlite3BeginWriteOperation(pParse, 0, i);
|
||||
for(i=0; i<nDb; i++){
|
||||
sqlite3CodeVerifySchema(pParse, i);
|
||||
}
|
||||
if( pParse->writeMask ){
|
||||
for(i=0; i<nDb; i++){
|
||||
sqlite3BeginWriteOperation(pParse, 0, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -32,6 +32,16 @@ typedef struct WhereLoopBuilder WhereLoopBuilder;
|
||||
typedef struct WhereScan WhereScan;
|
||||
typedef struct WhereOrCost WhereOrCost;
|
||||
typedef struct WhereOrSet WhereOrSet;
|
||||
typedef struct WhereMemBlock WhereMemBlock;
|
||||
|
||||
/*
|
||||
** This object is a header on a block of allocated memory that will be
|
||||
** automatically freed when its WInfo oject is destructed.
|
||||
*/
|
||||
struct WhereMemBlock {
|
||||
WhereMemBlock *pNext; /* Next block in the chain */
|
||||
u8 sz; /* Bytes of space */
|
||||
};
|
||||
|
||||
/*
|
||||
** This object contains information needed to implement a single nested
|
||||
@@ -478,6 +488,7 @@ struct WhereInfo {
|
||||
int iEndWhere; /* End of the WHERE clause itself */
|
||||
WhereLoop *pLoops; /* List of all WhereLoop objects */
|
||||
WhereExprMod *pExprMods; /* Expression modifications */
|
||||
WhereMemBlock *pMemToFree;/* Memory to free when this object destroyed */
|
||||
Bitmask revMask; /* Mask of ORDER BY terms that need reversing */
|
||||
WhereClause sWC; /* Decomposition of the WHERE clause */
|
||||
WhereMaskSet sMaskSet; /* Map cursor numbers to bitmasks */
|
||||
@@ -503,6 +514,8 @@ WhereTerm *sqlite3WhereFindTerm(
|
||||
u32 op, /* Mask of WO_xx values describing operator */
|
||||
Index *pIdx /* Must be compatible with this index, if not NULL */
|
||||
);
|
||||
void *sqlite3WhereMalloc(WhereInfo *pWInfo, u64 nByte);
|
||||
void *sqlite3WhereRealloc(WhereInfo *pWInfo, void *pOld, u64 nByte);
|
||||
|
||||
/* wherecode.c: */
|
||||
#ifndef SQLITE_OMIT_EXPLAIN
|
||||
|
||||
+3
-2
@@ -640,8 +640,9 @@ static int codeEqualityTerm(
|
||||
i = pLevel->u.in.nIn;
|
||||
pLevel->u.in.nIn += nEq;
|
||||
pLevel->u.in.aInLoop =
|
||||
sqlite3DbReallocOrFree(pParse->db, pLevel->u.in.aInLoop,
|
||||
sizeof(pLevel->u.in.aInLoop[0])*pLevel->u.in.nIn);
|
||||
sqlite3WhereRealloc(pTerm->pWC->pWInfo,
|
||||
pLevel->u.in.aInLoop,
|
||||
sizeof(pLevel->u.in.aInLoop[0])*pLevel->u.in.nIn);
|
||||
pIn = pLevel->u.in.aInLoop;
|
||||
if( pIn ){
|
||||
int iMap = 0; /* Index in aiMap[] */
|
||||
|
||||
+2
-8
@@ -64,7 +64,7 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u16 wtFlags){
|
||||
if( pWC->nTerm>=pWC->nSlot ){
|
||||
WhereTerm *pOld = pWC->a;
|
||||
sqlite3 *db = pWC->pWInfo->pParse->db;
|
||||
pWC->a = sqlite3DbMallocRawNN(db, sizeof(pWC->a[0])*pWC->nSlot*2 );
|
||||
pWC->a = sqlite3WhereMalloc(pWC->pWInfo, sizeof(pWC->a[0])*pWC->nSlot*2 );
|
||||
if( pWC->a==0 ){
|
||||
if( wtFlags & TERM_DYNAMIC ){
|
||||
sqlite3ExprDelete(db, p);
|
||||
@@ -73,10 +73,7 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u16 wtFlags){
|
||||
return 0;
|
||||
}
|
||||
memcpy(pWC->a, pOld, sizeof(pWC->a[0])*pWC->nTerm);
|
||||
if( pOld!=pWC->aStatic ){
|
||||
sqlite3DbFree(db, pOld);
|
||||
}
|
||||
pWC->nSlot = sqlite3DbMallocSize(db, pWC->a)/sizeof(pWC->a[0]);
|
||||
pWC->nSlot = pWC->nSlot*2;
|
||||
}
|
||||
pTerm = &pWC->a[idx = pWC->nTerm++];
|
||||
if( (wtFlags & TERM_VIRTUAL)==0 ) pWC->nBase = pWC->nTerm;
|
||||
@@ -1686,9 +1683,6 @@ void sqlite3WhereClauseClear(WhereClause *pWC){
|
||||
a++;
|
||||
}
|
||||
}
|
||||
if( pWC->a!=pWC->aStatic ){
|
||||
sqlite3DbFree(db, pWC->a);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -533,4 +533,34 @@ Columns renamed during .import shell5.csv due to duplicates:
|
||||
"CoW" to "CoW_3",
|
||||
"cOw" to "cOw_4"}}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Tests for preserving utf-8 that is not also ASCII.
|
||||
#
|
||||
|
||||
do_test shell5-6.1 {
|
||||
set out [open shell5.csv w]
|
||||
fconfigure $out -translation lf
|
||||
puts $out {あい,うえお}
|
||||
puts $out {1,2}
|
||||
close $out
|
||||
forcedelete test.db
|
||||
catchcmd test.db {.import -csv shell5.csv t1
|
||||
.mode line
|
||||
SELECT * FROM t1;}
|
||||
} {0 { あい = 1
|
||||
うえお = 2}}
|
||||
|
||||
do_test shell5-6.2 {
|
||||
set out [open shell5.csv w]
|
||||
fconfigure $out -translation lf
|
||||
puts $out {1,2}
|
||||
puts $out {あい,うえお}
|
||||
close $out
|
||||
forcedelete test.db
|
||||
catchcmd test.db {.import -csv shell5.csv t1
|
||||
.mode line
|
||||
SELECT * FROM t1;}
|
||||
} {0 { 1 = あい
|
||||
2 = うえお}}
|
||||
|
||||
finish_test
|
||||
|
||||
Reference in New Issue
Block a user