diff options
| author | drh <> | 2024-09-25 09:43:05 +0000 |
|---|---|---|
| committer | drh <> | 2024-09-25 09:43:05 +0000 |
| commit | 8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d (patch) | |
| tree | da7a6ff8f40f74f209fd274f7cf974aa8c6c0fb4 /ext/expert/sqlite3expert.c | |
| parent | 18e2ace4681c6b1d4950811a6123c014ba0fbab0 (diff) | |
| parent | 8cd30e3f5b6306b8d657e3dd7376763ab10f0279 (diff) | |
| download | sqlite-8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d.tar.gz sqlite-8f1f9ef09f20fbdb00a2ffac4c807cbce817b83d.zip | |
Merge trunk enhancements, and especially the zero- and double-width character
processing for columnar outputs into the cli-stdlib branch.
FossilOrigin-Name: d6262a4bcd7b0334b23ae4d194ca2bce7c6554ee6c678666b24c830e4c14a467
Diffstat (limited to 'ext/expert/sqlite3expert.c')
| -rw-r--r-- | ext/expert/sqlite3expert.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c index b59a59728..317733958 100644 --- a/ext/expert/sqlite3expert.c +++ b/ext/expert/sqlite3expert.c @@ -1623,6 +1623,12 @@ static int idxPopulateOneStat1( const char *zComma = zCols==0 ? "" : ", "; const char *zName = (const char*)sqlite3_column_text(pIndexXInfo, 0); const char *zColl = (const char*)sqlite3_column_text(pIndexXInfo, 1); + if( zName==0 ){ + /* This index contains an expression. Ignore it. */ + sqlite3_free(zCols); + sqlite3_free(zOrder); + return sqlite3_reset(pIndexXInfo); + } zCols = idxAppendText(&rc, zCols, "%sx.%Q IS sqlite_expert_rem(%d, x.%Q) COLLATE %s", zComma, zName, nCol, zName, zColl |