diff options
| author | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-10-10 20:13:18 +0000 |
| commit | a63b85299290b7eca076ea6e031e7f43d4feadcf (patch) | |
| tree | e925eb05965ec76f37b6483581d5bd8f8ea9e53b /src/date.c | |
| parent | 59255f9a98381960cfede9253277f128895531f6 (diff) | |
| parent | 7e65c94bdc689bebd222321dec5c034194267ac9 (diff) | |
| download | sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.tar.gz sqlite-a63b85299290b7eca076ea6e031e7f43d4feadcf.zip | |
Synchronize with the trunk.
FossilOrigin-Name: 136445ba020c9475d3f5a7843d7d0add98477138
Diffstat (limited to 'src/date.c')
| -rw-r--r-- | src/date.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/date.c b/src/date.c index 758dd7c89..5fe3f6786 100644 --- a/src/date.c +++ b/src/date.c @@ -294,8 +294,8 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){ ** Return the number of errors. */ static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){ - sqlite3 *db = sqlite3_context_db_handle(context); - if( sqlite3OsCurrentTimeInt64(db->pVfs, &p->iJD)==SQLITE_OK ){ + p->iJD = sqlite3StmtCurrentTime(context); + if( p->iJD>0 ){ p->validJD = 1; return 0; }else{ @@ -1078,8 +1078,8 @@ static void currentTimeFunc( UNUSED_PARAMETER(argc); UNUSED_PARAMETER(argv); - db = sqlite3_context_db_handle(context); - if( sqlite3OsCurrentTimeInt64(db->pVfs, &iT) ) return; + iT = sqlite3StmtCurrentTime(context); + if( iT<=0 ) return; t = iT/1000 - 10000*(sqlite3_int64)21086676; #ifdef HAVE_GMTIME_R pTm = gmtime_r(&t, &sNow); |