diff options
| author | drh <> | 2022-04-23 07:29:34 +0000 |
|---|---|---|
| committer | drh <> | 2022-04-23 07:29:34 +0000 |
| commit | ab843a51d3513508d805602a530f2fd2761aed71 (patch) | |
| tree | 919a9eeb46c4e3b08a93c4b99590d96f2dd9db98 /src/sqliteInt.h | |
| parent | 45e41b7371e60c75356a5037f2ddd91261674967 (diff) | |
| download | sqlite-ab843a51d3513508d805602a530f2fd2761aed71.tar.gz sqlite-ab843a51d3513508d805602a530f2fd2761aed71.zip | |
Fix minor problems with the new join table name resolution logic.
FossilOrigin-Name: 3a6b0db4519072dbd41b1c105bf1a0c6b4dd90380e94a5662645d8d41483c707
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 589a162a5..d9f5bc42e 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2125,6 +2125,7 @@ struct Column { #define COLFLAG_NOTAVAIL 0x0080 /* STORED column not yet calculated */ #define COLFLAG_BUSY 0x0100 /* Blocks recursion on GENERATED columns */ #define COLFLAG_HASCOLL 0x0200 /* Has collating sequence name in zCnName */ +#define COLFLAG_NOEXPAND 0x0400 /* Omit this column when expanding "*" */ #define COLFLAG_GENERATED 0x0060 /* Combo: _STORED, _VIRTUAL */ #define COLFLAG_NOINSERT 0x0062 /* Combo: _HIDDEN, _STORED, _VIRTUAL */ @@ -3005,7 +3006,7 @@ struct ExprList { unsigned bSorterRef :1; /* Defer evaluation until after sorting */ unsigned bNulls :1; /* True if explicit "NULLS FIRST/LAST" */ unsigned bUsed :1; /* This column used in a SF_NestedFrom subquery */ - unsigned bUsingTerm:1; /* Term from the USING clause */ + unsigned bUsingTerm:1; /* Term from the USING clause of a NestedFrom */ union { struct { /* Used by any ExprList other than Parse.pConsExpr */ u16 iOrderByCol; /* For ORDER BY, column number in result set */ |