diff options
| author | drh <> | 2022-04-23 07:31:50 +0000 |
|---|---|---|
| committer | drh <> | 2022-04-23 07:31:50 +0000 |
| commit | 0748e8bf9ad067d9c8ff1ee4c922df981b479633 (patch) | |
| tree | 3d0df28b5b5e61af8648d7693632efe09d34cb3c /src/sqliteInt.h | |
| parent | f054c34372ec1b5451a841e0bf90d145593d9ce4 (diff) | |
| parent | ab843a51d3513508d805602a530f2fd2761aed71 (diff) | |
| download | sqlite-0748e8bf9ad067d9c8ff1ee4c922df981b479633.tar.gz sqlite-0748e8bf9ad067d9c8ff1ee4c922df981b479633.zip | |
Correctly resolve left and right USING columns of an outer join in a
parenthesized subjoin.
FossilOrigin-Name: ea91aba88c31a042f4e32d66dfa089f95d0f9d316ab26f298085eb34dbf73e86
Diffstat (limited to 'src/sqliteInt.h')
| -rw-r--r-- | src/sqliteInt.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index ec465cdb3..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 */ @@ -3003,8 +3004,9 @@ struct ExprList { unsigned done :1; /* A flag to indicate when processing is finished */ unsigned reusable :1; /* Constant expression is reusable */ 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 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 of a NestedFrom */ union { struct { /* Used by any ExprList other than Parse.pConsExpr */ u16 iOrderByCol; /* For ORDER BY, column number in result set */ |