New testcase() macros. Fix a problem with INSERT when the IPK is to the
right of generated columns. FossilOrigin-Name: 412799fc5527aaca987e4e04b8a4f774dcdb70fb80e3a126dc3a26d48a66935c
This commit is contained in:
drh
parent
6b910364bb
commit
427b96aedf
18
manifest
18
manifest
@ -1,5 +1,5 @@
|
||||
C Merge\schanges\son\strunk\sinto\sthe\sgenerated-columns\sbranch.
|
||||
D 2019-10-22T12:02:09.134
|
||||
C New\stestcase()\smacros.\s\sFix\sa\sproblem\swith\sINSERT\swhen\sthe\sIPK\sis\sto\sthe\nright\sof\sgenerated\scolumns.
|
||||
D 2019-10-22T13:01:24.252
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -469,7 +469,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
|
||||
F src/btree.c a8a9c2ce62bdf54c8cf9795143d7cb10b7473a1230a0572f702d061ffcceefe5
|
||||
F src/btree.h f27a33c49280209a93385e218306c4ee5f46ba8d7649d2f81a7166b282232484
|
||||
F src/btreeInt.h 91806f01fd1145a9a86ba3042f25c38d8faf6002701bf5e780742cf88bcff437
|
||||
F src/build.c c8d76afe573ad68678206f85c122544d65932f95ad067e17570de930de4b0276
|
||||
F src/build.c acf54f35164aff7f0b06b82aae357e76e08b74e4c904bafd96643d4e155f34f8
|
||||
F src/callback.c 88615dfc0a82167b65b452b4b305dbf86be77200b3343c6ffc6d03e92a01d181
|
||||
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
|
||||
F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
|
||||
@ -486,7 +486,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
|
||||
F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
|
||||
F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
|
||||
F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
|
||||
F src/insert.c f657ee9898f147d3dd96986dae2611afb75bcef8dd3644f182232f5ca2268a0e
|
||||
F src/insert.c 760925fe9b4796e968bb9cd11426a3b9f6cc2c35b7b7acc5f25bcc84b73fb5a8
|
||||
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
|
||||
F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
|
||||
F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
|
||||
@ -530,7 +530,7 @@ F src/shell.c.in 3093bdf5eedd91da08f0268f1442aa510a60798c9441868149ddbecdf8bcaa7
|
||||
F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
|
||||
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
|
||||
F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
|
||||
F src/sqliteInt.h 3a498ce50d079e0b2c4d780fc48d93024afaac4511021bc121d4277cb1a3df56
|
||||
F src/sqliteInt.h ca968d2d348b7aa4cef7a16fdb7738c15834318e5bd9eca8a49388f48f0695a8
|
||||
F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
|
||||
F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
|
||||
F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
|
||||
@ -592,7 +592,7 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
|
||||
F src/tokenize.c 7b17f6e2f20f6cbcb0b215025a86b7457c38451fc7622f705e553d7a488c572d
|
||||
F src/treeview.c fddeb413159c3eeeaea3f496172f121cf3695606c461dc4e6dcee51417952df5
|
||||
F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
|
||||
F src/update.c e5c432097191e6e6c73e48364daa58b257b30a8b0d54b018fd0bd9415cd7b553
|
||||
F src/update.c 287146d2ce191228f0afaa34ffcaaaa196e2c2e2664008914e925dea6a64403e
|
||||
F src/upsert.c b445315c8958d8f17ec3297d06842e61dacaad0633ccaec1e4e160de7e562212
|
||||
F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
|
||||
F src/util.c 10d910e04a4f3842042485e0df01a484f57f912c10b60b3a09ccddd5019bd138
|
||||
@ -1847,7 +1847,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P bc368cb090376d33d3844e3689c4f6bd19eed758e39b878ee67fef93b1c839ea c7da1c01f1f239e68c2173ac5748b8c5798271e43bdcee68f51f97cd0ca92bd5
|
||||
R 3ed2fbe0c143869ff55bbbadcc27c112
|
||||
P ba123b8c201053d8f9387de38f3513b06f7721b28d79fab8489f96d336105117
|
||||
R c1cc6d4a971f76b9e92c16fa65923060
|
||||
U drh
|
||||
Z c16a467e1be0aad7834a9c102a3d7298
|
||||
Z 35d27d665bc3fbce0f6de471df281b5a
|
||||
|
||||
@ -1 +1 @@
|
||||
ba123b8c201053d8f9387de38f3513b06f7721b28d79fab8489f96d336105117
|
||||
412799fc5527aaca987e4e04b8a4f774dcdb70fb80e3a126dc3a26d48a66935c
|
||||
@ -2207,11 +2207,15 @@ void sqlite3EndTable(
|
||||
}
|
||||
#endif /* !defined(SQLITE_OMIT_CHECK) */
|
||||
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
|
||||
if( p->tabFlags & (TF_HasVirtual|TF_HasStored) ){
|
||||
if( p->tabFlags & TF_HasGenerated ){
|
||||
int ii;
|
||||
testcase( p->tabFlags & TF_HasVirtual );
|
||||
testcase( p->tabFlags & TF_HasStored );
|
||||
for(ii=0; ii<p->nCol; ii++){
|
||||
u32 colFlags = p->aCol[ii].colFlags;
|
||||
if( (colFlags & (COLFLAG_STORED|COLFLAG_VIRTUAL))!=0 ){
|
||||
if( (colFlags & COLFLAG_GENERATED)!=0 ){
|
||||
testcase( colFlags & COLFLAG_VIRTUAL );
|
||||
testcase( colFlags & COLFLAG_STORED );
|
||||
sqlite3ResolveSelfReference(pParse, p, NC_GenCol,
|
||||
p->aCol[ii].pDflt, 0);
|
||||
}
|
||||
|
||||
28
src/insert.c
28
src/insert.c
@ -222,6 +222,8 @@ void sqlite3ComputeGeneratedColumns(
|
||||
*/
|
||||
for(i=0; i<pTab->nCol; i++){
|
||||
if( pTab->aCol[i].colFlags & COLFLAG_GENERATED ){
|
||||
testcase( pTab->aCol[i].colflags & COLFLAG_VIRTUAL );
|
||||
testcase( pTab->aCol[i].colflags & COLFLAG_STORED );
|
||||
pTab->aCol[i].colFlags |= COLFLAG_NOTAVAIL;
|
||||
}
|
||||
}
|
||||
@ -854,6 +856,19 @@ void sqlite3Insert(
|
||||
*/
|
||||
if( pColumn==0 && nColumn>0 ){
|
||||
ipkColumn = pTab->iPKey;
|
||||
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
|
||||
if( pTab->tabFlags & TF_HasGenerated ){
|
||||
testcase( pTab->tabFlags & TF_HasVirtual );
|
||||
testcase( pTab->tabFlags & TF_HasGenerated );
|
||||
for(i=ipkColumn-1; i>=0; i--){
|
||||
if( pTab->aCol[i].colFlags & COLFLAG_GENERATED ){
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL );
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_GENERATED );
|
||||
ipkColumn--;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Make sure the number of columns in the source data matches the number
|
||||
@ -1070,7 +1085,9 @@ void sqlite3Insert(
|
||||
** columns have already been computed. This must be done after
|
||||
** computing the ROWID in case one of the generated columns
|
||||
** refers to the ROWID. */
|
||||
if( pTab->tabFlags & (TF_HasStored|TF_HasVirtual) ){
|
||||
if( pTab->tabFlags & TF_HasGenerated ){
|
||||
testcase( pTab->tabFlags & TF_HasVirtual );
|
||||
testcase( pTab->tabFlags & TF_HasStored );
|
||||
sqlite3ComputeGeneratedColumns(pParse, regCols+1, pTab);
|
||||
}
|
||||
#endif
|
||||
@ -1139,7 +1156,9 @@ void sqlite3Insert(
|
||||
** columns have already been computed. This must be done after
|
||||
** computing the ROWID in case one of the generated columns
|
||||
** refers to the ROWID. */
|
||||
if( pTab->tabFlags & (TF_HasStored|TF_HasVirtual) ){
|
||||
if( pTab->tabFlags & TF_HasGenerated ){
|
||||
testcase( pTab->tabFlags & TF_HasVirtual );
|
||||
testcase( pTab->tabFlags & TF_HasStored );
|
||||
sqlite3ComputeGeneratedColumns(pParse, regRowid+1, pTab);
|
||||
}
|
||||
#endif
|
||||
@ -1486,7 +1505,6 @@ void sqlite3GenerateConstraintChecks(
|
||||
testcase( i!=sqlite3TableColumnToStorage(pTab, i) );
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL );
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_STORED );
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_GENERATED );
|
||||
iReg = sqlite3TableColumnToStorage(pTab, i) + regNewData + 1;
|
||||
switch( onError ){
|
||||
case OE_Replace: {
|
||||
@ -2422,7 +2440,9 @@ static int xferOptimization(
|
||||
/* Generator expressions for generated columns must match */
|
||||
if( (pDestCol->colFlags & COLFLAG_GENERATED)!=0 ){
|
||||
if( sqlite3ExprCompare(0, pSrcCol->pDflt, pDestCol->pDflt, -1)!=0 ){
|
||||
return 0; /* Different generator expressions */
|
||||
testcase( pDestCol->colflags & COLFLAG_VIRTUAL );
|
||||
testcase( pDestCol->colflags & COLFLAG_STORED );
|
||||
return 0; /* Different generator expressions */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2037,6 +2037,7 @@ struct Table {
|
||||
#define TF_HasStat1 0x0010 /* nRowLogEst set from sqlite_stat1 */
|
||||
#define TF_HasVirtual 0x0020 /* Has one or more VIRTUAL columns */
|
||||
#define TF_HasStored 0x0040 /* Has one or more STORED columns */
|
||||
#define TF_HasGenerated 0x0060 /* Combo: HasVirtual + HasStored */
|
||||
#define TF_WithoutRowid 0x0080 /* No rowid. PRIMARY KEY is the key */
|
||||
#define TF_StatsUsed 0x0100 /* Query planner decisions affected by
|
||||
** Index.aiRowLogEst[] values */
|
||||
|
||||
12
src/update.c
12
src/update.c
@ -313,7 +313,9 @@ void sqlite3Update(
|
||||
chngPk = 1;
|
||||
}
|
||||
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
|
||||
else if( pTab->aCol[j].colFlags & (COLFLAG_STORED|COLFLAG_VIRTUAL) ){
|
||||
else if( pTab->aCol[j].colFlags & COLFLAG_GENERATED ){
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL );
|
||||
testcase( pTab->aCol[i].colFlags & COLFLAG_STORED );
|
||||
sqlite3ErrorMsg(pParse,
|
||||
"cannot UPDATE generated column \"%s\"",
|
||||
pTab->aCol[j].zName);
|
||||
@ -693,7 +695,9 @@ void sqlite3Update(
|
||||
}
|
||||
}
|
||||
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
|
||||
if( pTab->tabFlags & (TF_HasStored|TF_HasVirtual) ){
|
||||
if( pTab->tabFlags & TF_HasGenerated ){
|
||||
testcase( pTab->tabFlags & TF_HasVirtual );
|
||||
testcase( pTab->tabFlags & TF_HasStored );
|
||||
sqlite3ComputeGeneratedColumns(pParse, regNew, pTab);
|
||||
}
|
||||
#endif
|
||||
@ -737,7 +741,9 @@ void sqlite3Update(
|
||||
}
|
||||
}
|
||||
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
|
||||
if( pTab->tabFlags & (TF_HasStored|TF_HasVirtual) ){
|
||||
if( pTab->tabFlags & TF_HasGenerated ){
|
||||
testcase( pTab->tabFlags & TF_HasVirtual );
|
||||
testcase( pTab->tabFlags & TF_HasStored );
|
||||
sqlite3ComputeGeneratedColumns(pParse, regNew, pTab);
|
||||
}
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user