database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Fix incorrect arguments to testcase() macros.

Browse Source 
FossilOrigin-Name: 812467fbf04ce00228a8381a5eee471e4e35cc63184a4538129fcd70b7cec979
This commit is contained in:
drh
2019-10-23 03:53:10 +00:00
parent a1a01ffb5e
commit ab0992f022
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\sforeign\skey\slogic\sto\sbe\scompatible\swith\sgenerated\scolumns. C Fix\sincorrect\sarguments\sto\stestcase()\smacros.
D 2019-10-23T00:31:01.003 D 2019-10-23T03:53:10.742
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -469,7 +469,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
F src/btree.c a8a9c2ce62bdf54c8cf9795143d7cb10b7473a1230a0572f702d061ffcceefe5 F src/btree.c a8a9c2ce62bdf54c8cf9795143d7cb10b7473a1230a0572f702d061ffcceefe5
F src/btree.h f27a33c49280209a93385e218306c4ee5f46ba8d7649d2f81a7166b282232484 F src/btree.h f27a33c49280209a93385e218306c4ee5f46ba8d7649d2f81a7166b282232484
F src/btreeInt.h 91806f01fd1145a9a86ba3042f25c38d8faf6002701bf5e780742cf88bcff437 F src/btreeInt.h 91806f01fd1145a9a86ba3042f25c38d8faf6002701bf5e780742cf88bcff437
F src/build.c 27c8224737b4649ea6d264e8433e66bc226a6859c8e11a2f9849516c211da4d9 F src/build.c 7e4c835984afd813ab0511e6d2b6dad8e8dd8ecd227c58d589f36f15d588730f
F src/callback.c 88615dfc0a82167b65b452b4b305dbf86be77200b3343c6ffc6d03e92a01d181 F src/callback.c 88615dfc0a82167b65b452b4b305dbf86be77200b3343c6ffc6d03e92a01d181
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251 F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
@@ -486,7 +486,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c 7ab2c74825809a7e3cb1fa5b480d052c96c939dafb449713a7a9da0d949447af F src/insert.c aa90da6540183b60e91886648678d1ab785276c2a1b35f5d6ac6939b8c44300c
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d F src/loadext.c 4ddc65ae13c0d93db0ceedc8b14a28c8c260513448b0eb8c5a2ac375e3b6a85d
F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66 F src/main.c 3e01f6a1c96643381b5f9d79e4ff7f2520bc5712197746fb0852283e78cccf66
@@ -1847,7 +1847,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 9e04ba22dfce3998e61331ac229ff543ecccc590284c9dd5def21efbe594fba0 P 3de57145a18c62ff9b556c7218d8b276000d0052e4890212fa9335235f22d03c
R 4efaab9a7b4cdb038809c0556992ee41 R a55e27ef47378211556554247e39924e
U drh U drh
Z 7c33f9873611248b66edeb0dcba63fe2 Z fccb2616701d2c5fa9e700807faeffc4

2
manifest.uuid
View File

@@ -1 +1 @@
3de57145a18c62ff9b556c7218d8b276000d0052e4890212fa9335235f22d03c 812467fbf04ce00228a8381a5eee471e4e35cc63184a4538129fcd70b7cec979

4
src/build.c
View File

@@ -1407,8 +1407,8 @@ void sqlite3AddDefaultValue(
pCol->zName); pCol->zName);
#ifndef SQLITE_OMIT_GENERATED_COLUMNS #ifndef SQLITE_OMIT_GENERATED_COLUMNS
}else if( pCol->colFlags & COLFLAG_GENERATED ){ }else if( pCol->colFlags & COLFLAG_GENERATED ){
testcase( pCol->colflags & COLFLAG_VIRTUAL ); testcase( pCol->colFlags & COLFLAG_VIRTUAL );
testcase( pCol->colflags & COLFLAG_STORED ); testcase( pCol->colFlags & COLFLAG_STORED );
sqlite3ErrorMsg(pParse, "cannot use DEFAULT on a generated column"); sqlite3ErrorMsg(pParse, "cannot use DEFAULT on a generated column");
#endif #endif
}else{ }else{

8
src/insert.c
View File

@@ -222,8 +222,8 @@ void sqlite3ComputeGeneratedColumns(
*/ */
for(i=0; i<pTab->nCol; i++){ for(i=0; i<pTab->nCol; i++){
if( pTab->aCol[i].colFlags & COLFLAG_GENERATED ){ if( pTab->aCol[i].colFlags & COLFLAG_GENERATED ){
testcase( pTab->aCol[i].colflags & COLFLAG_VIRTUAL ); testcase( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL );
testcase( pTab->aCol[i].colflags & COLFLAG_STORED ); testcase( pTab->aCol[i].colFlags & COLFLAG_STORED );
pTab->aCol[i].colFlags |= COLFLAG_NOTAVAIL; pTab->aCol[i].colFlags |= COLFLAG_NOTAVAIL;
} }
} }
@@ -2440,8 +2440,8 @@ static int xferOptimization(
/* Generator expressions for generated columns must match */ /* Generator expressions for generated columns must match */
if( (pDestCol->colFlags & COLFLAG_GENERATED)!=0 ){ if( (pDestCol->colFlags & COLFLAG_GENERATED)!=0 ){
if( sqlite3ExprCompare(0, pSrcCol->pDflt, pDestCol->pDflt, -1)!=0 ){ if( sqlite3ExprCompare(0, pSrcCol->pDflt, pDestCol->pDflt, -1)!=0 ){
testcase( pDestCol->colflags & COLFLAG_VIRTUAL ); testcase( pDestCol->colFlags & COLFLAG_VIRTUAL );
testcase( pDestCol->colflags & COLFLAG_STORED ); testcase( pDestCol->colFlags & COLFLAG_STORED );
return 0; /* Different generator expressions */ return 0; /* Different generator expressions */
} }
} }