diff options
| author | dan <Dan Kennedy> | 2021-03-16 11:21:36 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2021-03-16 11:21:36 +0000 |
| commit | 00bc66f2cc2022be73bd75b5633f9ad935bfb2e9 (patch) | |
| tree | d9e2146f2897b416710b3526a6d94abc232f4e00 /src | |
| parent | 1e24072d05a9d4e56a5d73b27a128560c4ada959 (diff) | |
| parent | 776a578c2162fa3363ea377ffbad45b6e65161cc (diff) | |
| download | sqlite-00bc66f2cc2022be73bd75b5633f9ad935bfb2e9.tar.gz sqlite-00bc66f2cc2022be73bd75b5633f9ad935bfb2e9.zip | |
Merge trunk changes into this branch.
FossilOrigin-Name: f15d51054afb1e3fec87938f2b04a5a0d0611b08248367850450de7c4166e3d1
Diffstat (limited to 'src')
| -rw-r--r-- | src/alter.c | 8 | ||||
| -rw-r--r-- | src/shell.c.in | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/alter.c b/src/alter.c index 33940d0e2..c46228e2c 100644 --- a/src/alter.c +++ b/src/alter.c @@ -1457,12 +1457,12 @@ static void renameColumnFunc( for(pIdx=sParse.pNewIndex; pIdx; pIdx=pIdx->pNext){ sqlite3WalkExprList(&sWalker, pIdx->aColExpr); } - } #ifndef SQLITE_OMIT_GENERATED_COLUMNS - for(i=0; i<sParse.pNewTable->nCol; i++){ - sqlite3WalkExpr(&sWalker, sParse.pNewTable->aCol[i].pDflt); - } + for(i=0; i<sParse.pNewTable->nCol; i++){ + sqlite3WalkExpr(&sWalker, sParse.pNewTable->aCol[i].pDflt); + } #endif + } for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){ for(i=0; i<pFKey->nCol; i++){ diff --git a/src/shell.c.in b/src/shell.c.in index 9339d0939..980fa6e6f 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -3891,13 +3891,13 @@ static const char *(azHelp[]) = { ".databases List names and files of attached databases", ".dbconfig ?op? ?val? List or change sqlite3_db_config() options", ".dbinfo ?DB? Show status information about the database", - ".dump ?TABLE? Render database content as SQL", + ".dump ?OBJECTS? Render database content as SQL", " Options:", " --data-only Output only INSERT statements", " --newlines Allow unescaped newline characters in output", " --nosys Omit system tables (ex: \"sqlite_stat1\")", " --preserve-rowids Include ROWID values in the output", - " TABLE is a LIKE pattern for the tables to dump", + " OBJECTS is a LIKE pattern for tables, indexes, triggers or views to dump", " Additional LIKE patterns can be given in subsequent arguments", ".echo on|off Turn command echo on or off", ".eqp on|off|full|... Enable or disable automatic EXPLAIN QUERY PLAN", |