paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
src/build.c
+2 -2
View File
@@ -1407,8 +1407,8 @@ void sqlite3AddDefaultValue(
pCol->zName);
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
}else if( pCol->colFlags & COLFLAG_GENERATED ){
testcase( pCol->colflags & COLFLAG_VIRTUAL );
testcase( pCol->colflags & COLFLAG_STORED );
testcase( pCol->colFlags & COLFLAG_VIRTUAL );
testcase( pCol->colFlags & COLFLAG_STORED );
sqlite3ErrorMsg(pParse, "cannot use DEFAULT on a generated column");
#endif
}else{
src/insert.c
+4 -4
View File
@@ -222,8 +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 );
testcase( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL );
testcase( pTab->aCol[i].colFlags & COLFLAG_STORED );
pTab->aCol[i].colFlags |= COLFLAG_NOTAVAIL;
}
}
@@ -2440,8 +2440,8 @@ 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 ){
testcase( pDestCol->colflags & COLFLAG_VIRTUAL );
testcase( pDestCol->colflags & COLFLAG_STORED );
testcase( pDestCol->colFlags & COLFLAG_VIRTUAL );
testcase( pDestCol->colFlags & COLFLAG_STORED );
return 0; /* Different generator expressions */
}
}