diff options
author | danielk1977 <danielk1977@noemail.net> | 2004-05-18 09:58:06 +0000 |
---|---|---|
committer | danielk1977 <danielk1977@noemail.net> | 2004-05-18 09:58:06 +0000 |
commit | 84ac9d02dd8ff5d03ce8bc5e91a68c0989633eef (patch) | |
tree | e318aef61a7685902c7a485e0fa5c91b12be84e0 /src/build.c | |
parent | eb015e03e1c1e436bf17d457d8f98cc26e97aa41 (diff) | |
download | sqlite-84ac9d02dd8ff5d03ce8bc5e91a68c0989633eef.tar.gz sqlite-84ac9d02dd8ff5d03ce8bc5e91a68c0989633eef.zip |
Fix many problems with manifest types and column affinity. Most things are
working now. (CVS 1392)
FossilOrigin-Name: a62872aacd544a1465b06e007153168663f3c83a
Diffstat (limited to 'src/build.c')
-rw-r--r-- | src/build.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/build.c b/src/build.c index d26ad6a55..a1cd608b5 100644 --- a/src/build.c +++ b/src/build.c @@ -23,7 +23,7 @@ ** ROLLBACK ** PRAGMA ** -** $Id: build.c,v 1.186 2004/05/18 01:23:38 danielk1977 Exp $ +** $Id: build.c,v 1.187 2004/05/18 09:58:07 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -790,7 +790,7 @@ char sqlite3AffinityType(const char *zType, int nType){ for(n=0; n<(nType-2); n++){ for(i=0; i<sizeof(substrings)/sizeof(substrings[0]); i++){ - if( 0==sqlite3StrNICmp(zType, substrings[i].zSub, substrings[i].nSub) ){ + if( 0==sqlite3StrNICmp(&zType[n], substrings[i].zSub, substrings[i].nSub) ){ return substrings[i].affinity; } } @@ -992,7 +992,7 @@ void sqlite3EndTable(Parse *pParse, Token *pEnd, Select *pSelect){ n = Addr(pEnd->z) - Addr(pParse->sFirstToken.z) + 1; sqlite3VdbeChangeP3(v, -1, pParse->sFirstToken.z, n); } - sqlite3VdbeAddOp(v, OP_MakeRecord, 5, 0); + sqlite3VdbeOp3(v, OP_MakeRecord, 5, 0, "tttit", P3_STATIC); sqlite3VdbeAddOp(v, OP_PutIntKey, 0, 0); if( !p->iDb ){ sqlite3ChangeCookie(db, v); @@ -1002,7 +1002,7 @@ void sqlite3EndTable(Parse *pParse, Token *pEnd, Select *pSelect){ sqlite3VdbeAddOp(v, OP_Integer, p->iDb, 0); sqlite3VdbeAddOp(v, OP_OpenWrite, 1, 0); pParse->nTab = 2; - sqlite3Select(pParse, pSelect, SRT_Table, 1, 0, 0, 0); + sqlite3Select(pParse, pSelect, SRT_Table, 1, 0, 0, 0, 0); } sqlite3EndWriteOperation(pParse); } @@ -1720,7 +1720,7 @@ void sqlite3CreateIndex( n = Addr(pEnd->z) - Addr(pStart->z) + 1; sqlite3VdbeChangeP3(v, addr, pStart->z, n); } - sqlite3VdbeAddOp(v, OP_MakeRecord, 5, 0); + sqlite3VdbeOp3(v, OP_MakeRecord, 5, 0, "tttit", P3_STATIC); sqlite3VdbeAddOp(v, OP_PutIntKey, 0, 0); if( pTable ){ sqlite3VdbeAddOp(v, OP_Integer, pTab->iDb, 0); |