diff options
| author | drh <> | 2021-10-01 02:16:52 +0000 |
|---|---|---|
| committer | drh <> | 2021-10-01 02:16:52 +0000 |
| commit | 817424fe377dd4980f23a37125da8f39abdaba1c (patch) | |
| tree | 7d52741b38a254d143147778a12e4fc6863e4fa1 /src/select.c | |
| parent | f06db3e8929e36f7686ccc8f9f138359c6b12e80 (diff) | |
| parent | afaa660aef3d596fabbbcf6e99746294f77dbafa (diff) | |
| download | sqlite-817424fe377dd4980f23a37125da8f39abdaba1c.tar.gz sqlite-817424fe377dd4980f23a37125da8f39abdaba1c.zip | |
Merge updates from trunk
FossilOrigin-Name: 35351371c5e9602dec210ad0926ff8a1a269556ce1a166e81eb0543938e0c57e
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/select.c b/src/select.c index ba82d624d..6af8b85bc 100644 --- a/src/select.c +++ b/src/select.c @@ -5499,9 +5499,9 @@ static int selectExpander(Walker *pWalker, Select *p){ pTab->zName); } pFrom->pSelect = sqlite3SelectDup(db, pTab->u.view.pSelect, 0); - }else + } #ifndef SQLITE_OMIT_VIRTUALTABLE - if( ALWAYS(IsVirtual(pTab)) + else if( ALWAYS(IsVirtual(pTab)) && pFrom->fg.fromDDL && ALWAYS(pTab->u.vtab.p!=0) && pTab->u.vtab.p->eVtabRisk > ((db->flags & SQLITE_TrustedSchema)!=0) |