aboutsummaryrefslogtreecommitdiff
path: root/src/build.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2020-01-09 20:44:37 +0000
committerdrh <drh@noemail.net>2020-01-09 20:44:37 +0000
commitbebce86cde221fdaaf084d296ab811af1e5a3cf2 (patch)
tree14fce64f57bc80fffa399ae283d980e06ea91a27 /src/build.c
parent32d184e049b5a30d39b01be1b310c563ae716d23 (diff)
parentb84fda37efdd612288c1bc4933fa3ae6bcc2ffbc (diff)
downloadsqlite-bebce86cde221fdaaf084d296ab811af1e5a3cf2.tar.gz
sqlite-bebce86cde221fdaaf084d296ab811af1e5a3cf2.zip
Merge in the untrusted-schema enhancements.
See [/doc/87aea3ab1cdda453/doc/trusted-schema.md|doc/trusted-schema.md] for details. FossilOrigin-Name: 5720924cb07766cd54fb042da58f4b4acf12b60029fba86a23a606ad0d0f7c68
Diffstat (limited to 'src/build.c')
-rw-r--r--src/build.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/build.c b/src/build.c
index 81332356e..f0435aace 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1404,8 +1404,9 @@ void sqlite3AddDefaultValue(
sqlite3 *db = pParse->db;
p = pParse->pNewTable;
if( p!=0 ){
+ int isInit = db->init.busy && db->init.iDb!=1;
pCol = &(p->aCol[p->nCol-1]);
- if( !sqlite3ExprIsConstantOrFunction(pExpr, db->init.busy) ){
+ if( !sqlite3ExprIsConstantOrFunction(pExpr, isInit) ){
sqlite3ErrorMsg(pParse, "default value of column [%s] is not constant",
pCol->zName);
#ifndef SQLITE_OMIT_GENERATED_COLUMNS