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

Simplify the code and add test cases.

Browse Source 
FossilOrigin-Name: d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
This commit is contained in:
drh
2023-02-07 23:55:59 +00:00
parent d4af882a1b
commit 3393ee7ff6
6 changed files with 85 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/vdbeapi.c
View File

@@ -970,41 +970,27 @@ int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut){
** statement, the exact same time is returned for each invocation regardless
** of the amount of time that elapses between invocations. In other words,
** the time returned is always the time of the first call.
**
** Or, if bTxn, return the transaction time. The transaction time is the
** same for all calls within the same transaction.
**
** bTxn is 0 for SQL like datetime('now') and is 1 for datetime('txn').
*/
sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p, int bTxn){
int rc;
#ifndef SQLITE_ENABLE_STAT4
sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
sqlite3_int64 *piTime;
sqlite3 *db = p->pOut->db;
assert( p->pVdbe!=0 );
piTime = bTxn ? &db->txnTime : &p->pVdbe->iCurrentTime;
#else
sqlite3_int64 iTime = 0;
sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
sqlite3_int64 *piTime;
sqlite3 *db = p->pOut->db;
piTime = bTxn ? &db->txnTime : p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
#endif
if( *piTime==0 ){
rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
if( rc ) *piTime = 0;
}
return *piTime;
}
/*
** Return the current time for a transaction. If the current time
** is requested more than once within the same transaction
** the same time is returned for each invocation regardless
** of the amount of time that elapses between invocations. In other words,
** the time returned is always the time of the first call.
*/
sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context *p){
int rc;
#ifndef SQLITE_ENABLE_STAT4
sqlite3_int64 *piTime = &p->pVdbe->db->txnTime;
assert( p->pVdbe!=0 );
#else
sqlite3_int64 iTime = 0;
sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->db->txnTime : &iTime;
#endif
if( *piTime==0 ){
rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
rc = sqlite3OsCurrentTimeInt64(db->pVfs, piTime);
if( rc ) *piTime = 0;
}
return *piTime;