database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-09 10:21:35 +03:00
Code Activity

Remove the stale implementation of the ifnull and coalesce functions - code

Browse Source 
that has been commented out for ages.  No functional changes.

FossilOrigin-Name: c2ad691174b8af2e8b158d8840cfc93f75d7db71
This commit is contained in:
drh
2012-09-10 15:02:32 +00:00
parent 9dc2a73662
commit 0fdbdbea03
3 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\susing\sthe\ssqlite3ErrStr\sfunction\sin\sthe\sTcl\spackage\sif\sUSE_SYSTEM_SQLITE\sis\sdefined. C Remove\sthe\sstale\simplementation\sof\sthe\sifnull\sand\scoalesce\sfunctions\s-\scode\nthat\shas\sbeen\scommented\sout\sfor\sages.\s\sNo\sfunctional\schanges.
D 2012-09-10T09:33:09.064 D 2012-09-10T15:02:32.827
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -135,7 +135,7 @@ F src/delete.c 335f36750dc6ac88d580aa36a6487459be9889de
F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a F src/expr.c 217840a107dcc1e5dbb57cea311daad04bedbb9a
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296 F src/fkey.c 9c77d842dc9961d92a06a65abb80c64ef1750296
F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879 F src/func.c b4e88b92838fdab8e0088cc8411c06664b4dcf55
F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073 F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -1014,7 +1014,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P af870ca9827d2079a35dbb545660f670c7ca9512 P a716b9a3091072774d067c0a1258b0f4c39a4180
R 41116711b74a4531ffcdbedf61877a05 R e24ef4a70ae15b9fa5b9d09102845b46
U mistachkin U drh
Z 81d27ccc240f2f1ae0e0280e87c1196f Z fa9683e591df1b702d6598781636d3de

2
manifest.uuid
View File

@@ -1 +1 @@
a716b9a3091072774d067c0a1258b0f4c39a4180 c2ad691174b8af2e8b158d8840cfc93f75d7db71

31
src/func.c
View File

@@ -367,33 +367,14 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
} }
} }
#if 0 /* This function is never used. */
/* /*
** The COALESCE() and IFNULL() functions used to be implemented as shown ** The COALESCE() and IFNULL() functions are implemented as VDBE code so
** here. But now they are implemented as VDBE code so that unused arguments ** that unused argument values do not have to be computed. However, we
** do not have to be computed. This legacy implementation is retained as ** still need some kind of function implementation for this routines in
** comment. ** the function table. That function implementation will never be called
** so it doesn't matter what the implementation is. We might as well use
** the "version()" function as a substitute.
*/ */
/*
** Implementation of the IFNULL(), NVL(), and COALESCE() functions.
** All three do the same thing. They return the first non-NULL
** argument.
*/
static void ifnullFunc(
sqlite3_context *context,
int argc,
sqlite3_value **argv
){
int i;
for(i=0; i<argc; i++){
if( SQLITE_NULL!=sqlite3_value_type(argv[i]) ){
sqlite3_result_value(context, argv[i]);
break;
}
}
}
#endif /* NOT USED */
#define ifnullFunc versionFunc /* Substitute function - never called */ #define ifnullFunc versionFunc /* Substitute function - never called */
/* /*