database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Avoid unnecessary float->text->float conversions in date/time processing.

Browse Source 
This change necessary to reproduce the problem reported by BareFoot. (CVS 5213)

FossilOrigin-Name: 6ec4d7653b1e67ba0951e909ee23fe774762d646
This commit is contained in:
drh
2008-06-12 13:50:00 +00:00
parent 66147c9715
commit 3af5d685d7
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/date.c
View File

@@ -16,7 +16,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
** $Id: date.c,v 1.81 2008/06/12 12:51:37 drh Exp $
** $Id: date.c,v 1.82 2008/06/12 13:50:00 drh Exp $
**
** SQLite processes all times and dates as Julian Day numbers. The
** dates and times are stored as the number of days since noon
@@ -313,6 +313,17 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
return 0;
}
/*
** Set the time to the current time reported by the VFS
*/
static void setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
double r;
sqlite3 *db = sqlite3_context_db_handle(context);
sqlite3OsCurrentTime(db->pVfs, &r);
p->rJD = r;
p->validJD = 1;
}
/*
** Attempt to parse the given string into a Julian Day Number. Return
** the number of errors.
@@ -340,11 +351,7 @@ static int parseDateOrTime(
}else if( parseHhMmSs(zDate, p)==0 ){
return 0;
}else if( sqlite3StrICmp(zDate,"now")==0){
double r;
sqlite3 *db = sqlite3_context_db_handle(context);
sqlite3OsCurrentTime(db->pVfs, &r);
p->rJD = r;
p->validJD = 1;
setDateTimeToCurrent(context, p);
return 0;
}else if( sqlite3IsNumber(zDate, 0, SQLITE_UTF8) ){
getValue(zDate, &p->rJD);
@@ -708,14 +715,18 @@ static int isDate(
){
int i;
const unsigned char *z;
static const unsigned char zDflt[] = "now";
memset(p, 0, sizeof(*p));
if( argc==0 ){
z = zDflt;
setDateTimeToCurrent(context, p);
}else if( sqlite3_value_type(argv[0])==SQLITE_FLOAT ){
memset(p, 0, sizeof(*p));
p->rJD = sqlite3_value_double(argv[0]);
p->validJD = 1;
}else{
z = sqlite3_value_text(argv[0]);
}
if( !z || parseDateOrTime(context, (char*)z, p) ){
return 1;
if( !z || parseDateOrTime(context, (char*)z, p) ){
return 1;
}
}
for(i=1; i<argc; i++){
if( (z = sqlite3_value_text(argv[i]))==0 || parseModifier((char*)z, p) ){