Simplify the code and add test cases.

FossilOrigin-Name: d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5

diff --git a/manifest b/manifest
index d91cd340c48c0836980f35a01724f26010f83c73..1be3d9ae98f2eb8ed697806b30dc0edbc5c8057d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\s'txn'\sargument\sto\sdate/time\sfunctions\sthat\sworks\slike\n'now'\sbut\skeeps\sthe\ssame\stime\sfor\sthe\sentire\stransaction.
-D 2023-02-07T21:55:14.119
+C Simplify\sthe\scode\sand\sadd\stest\scases.
+D 2023-02-07T23:55:59.881
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -567,7 +567,7 @@ F src/build.c c55ab6d1b089ceef57160e840f05f692955ac90944c3d04fcf01d97fd7bfd08d
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
-F src/date.c ff2d10db98269759315c2048d3cc16cc135f7b39f394fa7442e37f9f9161892f
+F src/date.c 0c5db79ea1d5951ed917fa43046e9cc146dfbef5ff46106abe76b69e2523a9f5
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c 86573edae75e3d3e9a8b590d87db8e47222103029df4f3e11fa56044459b514e
@@ -626,7 +626,7 @@ F src/shell.c.in 250817509dbf12e258e334fdcd87901e35a6b63dc285885fec5f577ebb67b49
 F src/sqlite.h.in e26116b4dba94903c78db0f3281493435cf70ee049e2e8270b1013fad740fdb1
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
-F src/sqliteInt.h 459e7dc3936c3f3321d588f9e74c1298526c29dced7e3b9c0b63de5a5e5ecdcc
+F src/sqliteInt.h 859e193140c393a9a50dd81345b95130b208a312dd064867065c5e637232ed58
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -694,7 +694,7 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 47d3b78e75e239e1909933f0d77612b4111ebe760f01fdd0085e4e30b59b4cc6
 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
-F src/vdbeapi.c 0760fbeea76491a4c5b79ff0ec212915e7fe27c60ba319ef232ec25403ef4493
+F src/vdbeapi.c be64df0e21a43056b62f46777749347b7d51f6e5e6c419c4bf42ce9bf98d6064
 F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 87d3811aabb68eb9210c14c9a8b5e8ec3acb7ba787beb80a4323af54fb6013f7
@@ -910,7 +910,7 @@ F test/ctime.test 340f362f41f92972bbd71f44e10569a5cc694062b692231bd08aa6fe6c1c47
 F test/cursorhint.test 0175e4404181ace3ceca8b114eb0a98eae600d565aa4e2705abbe6614c7fe201
 F test/cursorhint2.test 6f3aa9cb19e7418967a10ec6905209bcbb5968054da855fc36c8beee9ae9c42f
 F test/dataversion1.test 6e5e86ac681f0782e766ebcb56c019ae001522d114e0e111e5ebf68ccf2a7bb8
-F test/date.test 118e04db8c8b4efeb885542b4918c7b869a34c460a6bebbfe927dfd75706b80d
+F test/date.test 0890bbd03f722169ae34f6d6f7822061d5fda8742355438562638ebed07e227c
 F test/date2.test 7e12ec14aaf4d5e6294b4ba140445b0eca06ea50062a9c3a69c4ee13d0b6f8b1
 F test/date3.test a1b77abf05c6772fe5ca2337cac1398892f2a41e62bce7e6be0f4a08a0e64ae5
 F test/dbdata.test 042f49acff3438f940eeba5868d3af080ae64ddf26ae78f80c92bec3ca7d8603
@@ -2045,11 +2045,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2abc3f9de0d2b66342598ab9015e62568ed20c7da4744a0f0a76b1db72c7e941
-R c0a88244db992b40f65ce347d314e978
-T *branch * txn-date
-T *sym-txn-date *
-T -sym-trunk *
+P 5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
+R c20bc84a84eb9b7dcb5243c1d98778fa
 U drh
-Z 947981482da05fefcea564acb307123a
+Z 4b08eb982cff98771c7da608dde8a084
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3cfde09ef507eba0e36c2b7aa8c38e89a613ee35..b7c2e2f8f598149facea9ef849b066c508dce22a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5e4f45af96247e29910403a63ac148cb313b005f9c014b37a9a49d98f5fef9a6
\ No newline at end of file
+d3bed4caff561e71c396cc869c5b4d9bf216ba203485e738c12ec62741f1aba5
\ No newline at end of file

diff --git a/src/date.c b/src/date.c
index 21077df93f2648c1526793bad0b03dc221b47c6d..6c48d45e33189a71f99bad6ff895b65f64306db6 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -335,27 +335,12 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
 ** that is currently executing.  The same time is reported for all
 ** invocations of this routine from within the same call to sqlite3_step().
 **
-** Return the number of errors.
-*/
-static int setCurrentStmtTime(sqlite3_context *context, DateTime *p){
-  p->iJD = sqlite3StmtCurrentTime(context);
-  if( p->iJD>0 ){
-    p->validJD = 1;
-    return 0;
-  }else{
-    return 1;
-  }
-}
-
-/*
-** Set the time to the current time reported for the current transaction.
-** The same time is set for all calls to this routine within the same
-** transaction.
+** Or if bTxn is true, use the transaction time.
 **
 ** Return the number of errors.
 */
-static int setCurrentTxnTime(sqlite3_context *context, DateTime *p){
-  p->iJD = sqlite3TxnCurrentTime(context);
+static int setCurrentStmtTime(sqlite3_context *context, DateTime *p, int bTxn){
+  p->iJD = sqlite3StmtCurrentTime(context, bTxn);
   if( p->iJD>0 ){
     p->validJD = 1;
     return 0;
@@ -406,9 +391,9 @@ static int parseDateOrTime(
   }else if( parseHhMmSs(zDate, p)==0 ){
     return 0;
   }else if( sqlite3StrICmp(zDate,"now")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentStmtTime(context, p);
+    return setCurrentStmtTime(context, p, 0);
   }else if( sqlite3StrICmp(zDate,"txn")==0 && sqlite3NotPureFunc(context) ){
-    return setCurrentTxnTime(context, p);
+    return setCurrentStmtTime(context, p, 1);
   }else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
     setRawDateNumber(p, r);
     return 0;
@@ -967,7 +952,7 @@ static int isDate(
   memset(p, 0, sizeof(*p));
   if( argc==0 ){
     if( !sqlite3NotPureFunc(context) ) return 1;
-    return setCurrentStmtTime(context, p);
+    return setCurrentStmtTime(context, p, 0);
   }
   if( (eType = sqlite3_value_type(argv[0]))==SQLITE_FLOAT
                    || eType==SQLITE_INTEGER ){

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 638260c5dce5ecfda8895bbb628bd43dc05887d8..73378dbf61bfd1e5ba15e8cd2cd1bd4a69e4dfa1 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -5341,8 +5341,7 @@ FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
     && !defined(SQLITE_OMIT_VIRTUALTABLE)
   void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
 #endif
-sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
-sqlite3_int64 sqlite3TxnCurrentTime(sqlite3_context*);
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*, int);
 int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
 int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
 void sqlite3ParseObjectInit(Parse*,sqlite3*);

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 432c1fa225a801c79d80c4a6f54b585c9bbbfeee..722d1215f1fde995118706d869cd1cfebd72d479 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -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){
-  int rc;
-#ifndef SQLITE_ENABLE_STAT4
-  sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
-  assert( p->pVdbe!=0 );
-#else
-  sqlite3_int64 iTime = 0;
-  sqlite3_int64 *piTime = 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){
+sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p, int bTxn){
   int rc;
 #ifndef SQLITE_ENABLE_STAT4
-  sqlite3_int64 *piTime = &p->pVdbe->db->txnTime;
+  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->db->txnTime : &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);
+    rc = sqlite3OsCurrentTimeInt64(db->pVfs, piTime);
     if( rc ) *piTime = 0;
   }
   return *piTime;

diff --git a/test/date.test b/test/date.test
index 62233ad8f62c8acf672b7c9bebc18badda510f63..8ade3e43c863b28b811cdde972a87fd096317b8a 100644 (file)
--- a/test/date.test
+++ b/test/date.test
@@ -309,9 +309,9 @@ sqlite3_test_control SQLITE_TESTCTRL_LOCALTIME_FAULT 0
 #
 datetest 7.1 {datetime(null)} NULL
 datetest 7.2 {datetime('now',null)} NULL
-datetest 7.3 {datetime('now','localtime',null)} NULL
+datetest 7.3 {datetime('txn','localtime',null)} NULL
 datetest 7.4 {time(null)} NULL
-datetest 7.5 {time('now',null)} NULL
+datetest 7.5 {time('txn',null)} NULL
 datetest 7.6 {time('now','localtime',null)} NULL
 datetest 7.7 {date(null)} NULL
 datetest 7.8 {date('now',null)} NULL
@@ -322,28 +322,28 @@ datetest 7.12 {julianday('now','localtime',null)} NULL
 datetest 7.13 {strftime(null,'now')} NULL
 datetest 7.14 {strftime('%s',null)} NULL
 datetest 7.15 {strftime('%s','now',null)} NULL
-datetest 7.16 {strftime('%s','now','localtime',null)} NULL
+datetest 7.16 {strftime('%s','txn','localtime',null)} NULL
 
 # Test modifiers when the date begins as a julian day number - to
 # make sure the HH:MM:SS is preserved.  Ticket #551.
 #
 set sqlite_current_time [db eval {SELECT strftime('%s','2003-10-22 12:34:00')}]
 datetest 8.1 {datetime('now','weekday 0')} {2003-10-26 12:34:00}
-datetest 8.2 {datetime('now','weekday 1')} {2003-10-27 12:34:00}
+datetest 8.2 {datetime('txn','weekday 1')} {2003-10-27 12:34:00}
 datetest 8.3 {datetime('now','weekday 2')} {2003-10-28 12:34:00}
-datetest 8.4 {datetime('now','weekday 3')} {2003-10-22 12:34:00}
+datetest 8.4 {datetime('txn','weekday 3')} {2003-10-22 12:34:00}
 datetest 8.5 {datetime('now','start of month')} {2003-10-01 00:00:00}
-datetest 8.6 {datetime('now','start of year')} {2003-01-01 00:00:00}
+datetest 8.6 {datetime('txn','start of year')} {2003-01-01 00:00:00}
 datetest 8.7 {datetime('now','start of day')} {2003-10-22 00:00:00}
-datetest 8.8 {datetime('now','1 day')} {2003-10-23 12:34:00}
+datetest 8.8 {datetime('txn','1 day')} {2003-10-23 12:34:00}
 datetest 8.9 {datetime('now','+1 day')} {2003-10-23 12:34:00}
-datetest 8.10 {datetime('now','+1.25 day')} {2003-10-23 18:34:00}
+datetest 8.10 {datetime('txn','+1.25 day')} {2003-10-23 18:34:00}
 datetest 8.11 {datetime('now','-1.0 day')} {2003-10-21 12:34:00}
-datetest 8.12 {datetime('now','1 month')} {2003-11-22 12:34:00}
+datetest 8.12 {datetime('txn','1 month')} {2003-11-22 12:34:00}
 datetest 8.13 {datetime('now','11 month')} {2004-09-22 12:34:00}
-datetest 8.14 {datetime('now','-13 month')} {2002-09-22 12:34:00}
+datetest 8.14 {datetime('txn','-13 month')} {2002-09-22 12:34:00}
 datetest 8.15 {datetime('now','1.5 months')} {2003-12-07 12:34:00}
-datetest 8.16 {datetime('now','-5 years')} {1998-10-22 12:34:00}
+datetest 8.16 {datetime('txn','-5 years')} {1998-10-22 12:34:00}
 datetest 8.17 {datetime('now','+10.5 minutes')} {2003-10-22 12:44:30}
 datetest 8.18 {datetime('now','-1.25 hours')} {2003-10-22 11:19:00}
 datetest 8.19 {datetime('now','11.25 seconds')} {2003-10-22 12:34:11}
@@ -486,11 +486,55 @@ do_test date-15.1 {
   }
 } {0.0}
 do_test date-15.2 {
+  db func sleeper sleeper
+  db eval {
+     SELECT c - a FROM (SELECT julianday('txn') AS a,
+                               sleeper(), julianday('txn') AS c);
+  }
+} {0.0}
+do_test date-15.3 {
   db eval {
      SELECT a==b FROM (SELECT current_timestamp AS a,
                                sleeper(), current_timestamp AS b);
   }
 } {1}
+do_test date-15.4 {
+  db eval {
+     SELECT a==b FROM (SELECT julianday('txn') AS a,
+                               sleeper(), julianday('txn') AS b);
+  }
+} {0}
+
+do_execsql_test date-15.5 {
+  CREATE TEMP TABLE t15(a,b);
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {3 1}
+do_execsql_test date-15.6 {
+  DELETE FROM t15;
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('now'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {3 3}
+do_execsql_test date-15.7 {
+  DELETE FROM t15;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  BEGIN;
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  INSERT INTO t15(a,b) VALUES(julianday('txn'),sleeper());
+  COMMIT;
+  SELECT count(a), count(DISTINCT a) FROM t15;
+} {4 3}
+
+
 
 # Tests of extreme values in date/time functions.  Run with UBSan or the
 # equivalent to verify no signed interger overflow warnings.