diff options
| author | drh <drh@noemail.net> | 2016-03-04 16:42:43 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-03-04 16:42:43 +0000 |
| commit | 2606aca80f35c4672c7834e90786d737679fa35b (patch) | |
| tree | 2a8be85e2e802ad5ba42c4bb8e9102712cb287aa /src/select.c | |
| parent | fd37e67b16d6c6228aa58709299c86ec81a552a5 (diff) | |
| parent | 3298a641a2b1c883b34e9d85541db50d6e2d1ff9 (diff) | |
| download | sqlite-2606aca80f35c4672c7834e90786d737679fa35b.tar.gz sqlite-2606aca80f35c4672c7834e90786d737679fa35b.zip | |
Merge recent enhancements from trunk. Default page size is 4096. Writes
to statement journals are avoided.
FossilOrigin-Name: 456df3365e2df60e34762f2024bb551538b3f72b
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/select.c b/src/select.c index bde278b43..c9bc389b2 100644 --- a/src/select.c +++ b/src/select.c @@ -1429,8 +1429,8 @@ static const char *columnTypeImpl( zType = "INTEGER"; zOrigCol = "rowid"; }else{ - zType = pTab->aCol[iCol].zType; zOrigCol = pTab->aCol[iCol].zName; + zType = sqlite3StrNext(zOrigCol); estWidth = pTab->aCol[iCol].szEst; } zOrigTab = pTab->zName; @@ -1442,7 +1442,7 @@ static const char *columnTypeImpl( if( iCol<0 ){ zType = "INTEGER"; }else{ - zType = pTab->aCol[iCol].zType; + zType = sqlite3StrNext(pTab->aCol[iCol].zName); estWidth = pTab->aCol[iCol].szEst; } #endif @@ -1727,10 +1727,7 @@ static void selectAddColumnTypeAndCollation( a = pSelect->pEList->a; for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){ p = a[i].pExpr; - if( pCol->zType==0 ){ - pCol->zType = sqlite3DbStrDup(db, - columnType(&sNC, p,0,0,0, &pCol->szEst)); - } + columnType(&sNC, p, 0, 0, 0, &pCol->szEst); szAll += pCol->szEst; pCol->affinity = sqlite3ExprAffinity(p); if( pCol->affinity==0 ) pCol->affinity = SQLITE_AFF_BLOB; @@ -2225,7 +2222,6 @@ static int multiSelect( if( dest.eDest==SRT_EphemTab ){ assert( p->pEList ); sqlite3VdbeAddOp2(v, OP_OpenEphemeral, dest.iSDParm, p->pEList->nExpr); - sqlite3VdbeChangeP5(v, BTREE_UNORDERED); dest.eDest = SRT_Table; } |