Fix compilation with SQLITE_OMIT_FOREIGN_KEY defined. Ticket #3273. (CVS 5544)
FossilOrigin-Name: ce8cbeea51442ea963bcdf5ddc71f021fb996a37
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
C Fix\stypo\sin\scomments\sin\ssqlite.h.in.\sTicket\s#3271.\s(CVS\s5543)
|
||||
D 2008-08-06T13:40:13
|
||||
C Fix\scompilation\swith\sSQLITE_OMIT_FOREIGN_KEY\sdefined.\sTicket\s#3273.\s(CVS\s5544)
|
||||
D 2008-08-06T13:47:41
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@@ -99,7 +99,7 @@ F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
|
||||
F src/btree.c da7491ef06c0209da962e1520bfc5c90b5c5cc96
|
||||
F src/btree.h 03256ed7ee42b5ecacbe887070b0f8249e7d069d
|
||||
F src/btreeInt.h ab18c7b4980314e9e4b402e5dcde09f3c2545576
|
||||
F src/build.c f774f01e10885319d8f839cf00f25cc6a8a7d605
|
||||
F src/build.c 00aa62a843fcb7c4d47a7669af95cb6be08afd45
|
||||
F src/callback.c c9f75a4c403f166af3761df47d78a806587d63af
|
||||
F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
|
||||
F src/date.c 52a54811218a76da6235420f532ece841159a96d
|
||||
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P 65ab777fd0a29ca99a240411b94ac83041f90c98
|
||||
R 062a6d1b18fb34f3b84e60e72d9d04d3
|
||||
P 18030631e82c70e0d4d6093cd43fb0c0fa6d53c8
|
||||
R a954fc13cc336434d5e272a361cdb24e
|
||||
U danielk1977
|
||||
Z bce51016106cb526d8093f47ff45aea5
|
||||
Z 3569290c6359f5abc9d03dcdea8e12bf
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
18030631e82c70e0d4d6093cd43fb0c0fa6d53c8
|
||||
ce8cbeea51442ea963bcdf5ddc71f021fb996a37
|
||||
+2
-3
@@ -22,7 +22,7 @@
|
||||
** COMMIT
|
||||
** ROLLBACK
|
||||
**
|
||||
** $Id: build.c,v 1.493 2008/08/04 04:39:49 danielk1977 Exp $
|
||||
** $Id: build.c,v 1.494 2008/08/06 13:47:41 danielk1977 Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include <ctype.h>
|
||||
@@ -2136,6 +2136,7 @@ void sqlite3CreateForeignKey(
|
||||
ExprList *pToCol, /* Columns in the other table */
|
||||
int flags /* Conflict resolution algorithms. */
|
||||
){
|
||||
sqlite3 *db = pParse->db;
|
||||
#ifndef SQLITE_OMIT_FOREIGN_KEY
|
||||
FKey *pFKey = 0;
|
||||
Table *p = pParse->pNewTable;
|
||||
@@ -2143,10 +2144,8 @@ void sqlite3CreateForeignKey(
|
||||
int i;
|
||||
int nCol;
|
||||
char *z;
|
||||
sqlite3 *db;
|
||||
|
||||
assert( pTo!=0 );
|
||||
db = pParse->db;
|
||||
if( p==0 || pParse->nErr || IN_DECLARE_VTAB ) goto fk_end;
|
||||
if( pFromCol==0 ){
|
||||
int iCol = p->nCol-1;
|
||||
|
||||
Reference in New Issue
Block a user