diff options
| author | dan <dan@noemail.net> | 2015-06-02 18:07:58 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-06-02 18:07:58 +0000 |
| commit | 167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd (patch) | |
| tree | 4482f33a4ccf87878095e1bddd515f85f7d57137 /src/insert.c | |
| parent | dbef6e752e9c1d26f9f1a0a62fee3e523b490bf0 (diff) | |
| parent | 467c1c70fb519279fe5f806425923417673eb2f1 (diff) | |
| download | sqlite-167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd.tar.gz sqlite-167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: c9ffda4abb4390bbc5719e269196e2807b254f97
Diffstat (limited to 'src/insert.c')
| -rw-r--r-- | src/insert.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/insert.c b/src/insert.c index c794ae4f5..7e8741a9a 100644 --- a/src/insert.c +++ b/src/insert.c @@ -42,7 +42,7 @@ void sqlite3OpenTable( }else{ Index *pPk = sqlite3PrimaryKeyIndex(pTab); assert( pPk!=0 ); - assert( pPk->tnum=pTab->tnum ); + assert( pPk->tnum==pTab->tnum ); sqlite3VdbeAddOp3(v, opcode, iCur, pPk->tnum, iDb); sqlite3VdbeSetP4KeyInfo(pParse, pPk); VdbeComment((v, "%s", pTab->zName)); @@ -56,7 +56,7 @@ void sqlite3OpenTable( ** ** Character Column affinity ** ------------------------------ -** 'A' NONE +** 'A' BLOB ** 'B' TEXT ** 'C' NUMERIC ** 'D' INTEGER @@ -99,9 +99,9 @@ const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ /* ** Compute the affinity string for table pTab, if it has not already been -** computed. As an optimization, omit trailing SQLITE_AFF_NONE affinities. +** computed. As an optimization, omit trailing SQLITE_AFF_BLOB affinities. ** -** If the affinity exists (if it is no entirely SQLITE_AFF_NONE values) and +** If the affinity exists (if it is no entirely SQLITE_AFF_BLOB values) and ** if iReg>0 then code an OP_Affinity opcode that will set the affinities ** for register iReg and following. Or if affinities exists and iReg==0, ** then just set the P4 operand of the previous opcode (which should be @@ -111,7 +111,7 @@ const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ ** ** Character Column affinity ** ------------------------------ -** 'A' NONE +** 'A' BLOB ** 'B' TEXT ** 'C' NUMERIC ** 'D' INTEGER @@ -133,7 +133,7 @@ void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){ } do{ zColAff[i--] = 0; - }while( i>=0 && zColAff[i]==SQLITE_AFF_NONE ); + }while( i>=0 && zColAff[i]==SQLITE_AFF_BLOB ); pTab->zColAff = zColAff; } i = sqlite3Strlen30(zColAff); |