database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-25 20:58:26 +03:00
Code Activity

Patch so the the code compiles with -DSQLITE_OMIT_CHECK=1. (CVS 3737)

Browse Source 
FossilOrigin-Name: 72cea358da4bd38af322f18f2a753171f7decaf8
This commit is contained in:
drh
2007-03-29 00:08:24 +00:00
parent 95bad4c751
commit 7fc2f41bef
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Improvements\sto\sthe\sXFER\sOptimization\sof\sthe\sINSERT\sstatement.\s(CVS\s3736) C Patch\sso\sthe\sthe\scode\scompiles\swith\s-DSQLITE_OMIT_CHECK=1.\s(CVS\s3737)
D 2007-03-28T18:04:10 D 2007-03-29T00:08:25
F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -70,7 +70,7 @@ F src/expr.c a8740c24af3f39f2d502be1a1c640c96435eaac0
F src/func.c 94372fe3cf26b81d4dcdc15f98ff240c37c8c708 F src/func.c 94372fe3cf26b81d4dcdc15f98ff240c37c8c708
F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185 F src/hash.c 449f3d6620193aa557f5d86cbc5cc6b87702b185
F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
F src/insert.c 4233b6444cb154ad3d75d5a3ff0a42ae4eabad8a F src/insert.c 80b1cc840c769b283475ae4a7b4771ba1f7659a2
F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6
F src/loadext.c c186ad5c9e8a0aaa73d0caf5f604d112e45e8b89 F src/loadext.c c186ad5c9e8a0aaa73d0caf5f604d112e45e8b89
F src/main.c ed005bbc1d94670c8d9e2b93d446bd493119c44c F src/main.c ed005bbc1d94670c8d9e2b93d446bd493119c44c
@@ -442,7 +442,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 26348556d824c032851e409ac510cddb55c200bf P 53fff7d1f2f829010a2641c7738538b3155da4b2
R db52877417d9d83d0ac7a145c2f8f5c7 R a8b7b84401a648f00168521d709f0ebb
U drh U drh
Z 0cd9afba5878d43d08ad6c698fc49c72 Z 604fd965906231b9b5400c42a321a29e

2
manifest.uuid
View File

@@ -1 +1 @@
53fff7d1f2f829010a2641c7738538b3155da4b2 72cea358da4bd38af322f18f2a753171f7decaf8

4
src/insert.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser ** This file contains C code routines that are called by the parser
** to handle INSERT statements in SQLite. ** to handle INSERT statements in SQLite.
** **
** $Id: insert.c,v 1.178 2007/03/28 18:04:10 drh Exp $ ** $Id: insert.c,v 1.179 2007/03/29 00:08:25 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -1464,9 +1464,11 @@ static int xferOptimization(
return 0; /* pDestIdx has no corresponding index in pSrc */ return 0; /* pDestIdx has no corresponding index in pSrc */
} }
} }
#ifndef SQLITE_OMIT_CHECK
if( pDest->pCheck && !sqlite3ExprCompare(pSrc->pCheck, pDest->pCheck) ){ if( pDest->pCheck && !sqlite3ExprCompare(pSrc->pCheck, pDest->pCheck) ){
return 0; /* Tables have different CHECK constraints. Ticket #2252 */ return 0; /* Tables have different CHECK constraints. Ticket #2252 */
} }
#endif
/* If we get this far, it means either: /* If we get this far, it means either:
** **