mirror of
https://github.com/sqlite/sqlite.git
synced 2025-05-28 12:41:31 +03:00
Add a new modifier to date/time functions: "subsecond". May be
abbreviated as just "subsec". This modifier causes functions to try to show fractional seconds if they do not already. FossilOrigin-Name: 03f2a15e8779d8ca76510badeabde62a0539ce8a6368d7a9688f5aadc215b940
This commit is contained in:
drh
parent
88ed723490
commit
11d5efde75
17
manifest
17
manifest
@ -1,5 +1,5 @@
|
||||
C Increase\sCLI\stolerance\sof\sarifically\slow\smemory.
|
||||
D 2023-04-20T20:07:14.732
|
||||
C Add\sa\snew\smodifier\sto\sdate/time\sfunctions:\s"subsecond".\s\sMay\sbe\nabbreviated\sas\sjust\s"subsec".\s\sThis\smodifier\scauses\sfunctions\sto\stry\nto\sshow\sfractional\sseconds\sif\sthey\sdo\snot\salready.
|
||||
D 2023-04-21T15:30:47.608
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -578,7 +578,7 @@ F src/build.c 8357d6ca9a8c9afc297c431df28bc2af407b47f3ef2311875276c944b30c4d54
|
||||
F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
|
||||
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
|
||||
F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
|
||||
F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
|
||||
F src/date.c aca9e0c08b400b21238b609aea7c09585396cd770985cf8f475560f69222dad3
|
||||
F src/dbpage.c f3eea5f7ec47e09ee7da40f42b25092ecbe961fc59566b8e5f705f34335b2387
|
||||
F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
|
||||
F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
|
||||
@ -2059,8 +2059,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 104ab105ac0e96c0fc61c6d69179bf984fcfe5e0efb2c82f3742456c1b5fe5d1
|
||||
R aa97778045cfce91a857103f91418d38
|
||||
U larrybr
|
||||
Z aaec46b2f4c843c0506897156fa41de9
|
||||
P 13f2638622871db9b91db547dcfd38f61c03e7696e4df5144adefcd86140aeba
|
||||
R 2529341824942da9d8aad7d6b6ee37a6
|
||||
T *branch * subsec-modifier
|
||||
T *sym-subsec-modifier *
|
||||
T -sym-trunk *
|
||||
U drh
|
||||
Z 03013fcb8c96af9e078547fa6f689eef
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@ -1 +1 @@
|
||||
13f2638622871db9b91db547dcfd38f61c03e7696e4df5144adefcd86140aeba
|
||||
03f2a15e8779d8ca76510badeabde62a0539ce8a6368d7a9688f5aadc215b940
|
||||
91
src/date.c
91
src/date.c
@ -77,6 +77,7 @@ struct DateTime {
|
||||
char validTZ; /* True (1) if tz is valid */
|
||||
char tzSet; /* Timezone was set explicitly */
|
||||
char isError; /* An overflow has occurred */
|
||||
char useSubsec; /* Display subsecond precision */
|
||||
};
|
||||
|
||||
|
||||
@ -391,6 +392,11 @@ static int parseDateOrTime(
|
||||
}else if( sqlite3AtoF(zDate, &r, sqlite3Strlen30(zDate), SQLITE_UTF8)>0 ){
|
||||
setRawDateNumber(p, r);
|
||||
return 0;
|
||||
}else if( (sqlite3StrICmp(zDate,"subsec")==0
|
||||
|| sqlite3StrICmp(zDate,"subsecond")==0)
|
||||
&& sqlite3NotPureFunc(context) ){
|
||||
p->useSubsec = 1;
|
||||
return setDateTimeToCurrent(context, p);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@ -805,8 +811,22 @@ static int parseModifier(
|
||||
**
|
||||
** Move the date backwards to the beginning of the current day,
|
||||
** or month or year.
|
||||
**
|
||||
** subsecond
|
||||
** subsec
|
||||
**
|
||||
** Show subsecond precision in the output of datetime() and
|
||||
** unixepoch() and strftime('%s').
|
||||
*/
|
||||
if( sqlite3_strnicmp(z, "start of ", 9)!=0 ) break;
|
||||
if( sqlite3_strnicmp(z, "start of ", 9)!=0 ){
|
||||
if( sqlite3_stricmp(z, "subsec")==0
|
||||
|| sqlite3_stricmp(z, "subsecond")==0
|
||||
){
|
||||
p->useSubsec = 1;
|
||||
rc = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if( !p->validJD && !p->validYMD && !p->validHMS ) break;
|
||||
z += 9;
|
||||
computeYMD(p);
|
||||
@ -1004,7 +1024,11 @@ static void unixepochFunc(
|
||||
DateTime x;
|
||||
if( isDate(context, argc, argv, &x)==0 ){
|
||||
computeJD(&x);
|
||||
sqlite3_result_int64(context, x.iJD/1000 - 21086676*(i64)10000);
|
||||
if( x.useSubsec ){
|
||||
sqlite3_result_double(context, (x.iJD - 21086676*(i64)10000000)/1000.0);
|
||||
}else{
|
||||
sqlite3_result_int64(context, x.iJD/1000 - 21086676*(i64)10000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1020,8 +1044,8 @@ static void datetimeFunc(
|
||||
){
|
||||
DateTime x;
|
||||
if( isDate(context, argc, argv, &x)==0 ){
|
||||
int Y, s;
|
||||
char zBuf[24];
|
||||
int Y, s, n;
|
||||
char zBuf[32];
|
||||
computeYMD_HMS(&x);
|
||||
Y = x.Y;
|
||||
if( Y<0 ) Y = -Y;
|
||||
@ -1042,15 +1066,28 @@ static void datetimeFunc(
|
||||
zBuf[15] = '0' + (x.m/10)%10;
|
||||
zBuf[16] = '0' + (x.m)%10;
|
||||
zBuf[17] = ':';
|
||||
s = (int)x.s;
|
||||
zBuf[18] = '0' + (s/10)%10;
|
||||
zBuf[19] = '0' + (s)%10;
|
||||
zBuf[20] = 0;
|
||||
if( x.useSubsec ){
|
||||
s = (int)1000.0*x.s;
|
||||
zBuf[18] = '0' + (s/10000)%10;
|
||||
zBuf[19] = '0' + (s/1000)%10;
|
||||
zBuf[20] = '.';
|
||||
zBuf[21] = '0' + (s/100)%10;
|
||||
zBuf[22] = '0' + (s/10)%10;
|
||||
zBuf[23] = '0' + (s)%10;
|
||||
zBuf[24] = 0;
|
||||
n = 24;
|
||||
}else{
|
||||
s = (int)x.s;
|
||||
zBuf[18] = '0' + (s/10)%10;
|
||||
zBuf[19] = '0' + (s)%10;
|
||||
zBuf[20] = 0;
|
||||
n = 20;
|
||||
}
|
||||
if( x.Y<0 ){
|
||||
zBuf[0] = '-';
|
||||
sqlite3_result_text(context, zBuf, 20, SQLITE_TRANSIENT);
|
||||
sqlite3_result_text(context, zBuf, n, SQLITE_TRANSIENT);
|
||||
}else{
|
||||
sqlite3_result_text(context, &zBuf[1], 19, SQLITE_TRANSIENT);
|
||||
sqlite3_result_text(context, &zBuf[1], n-1, SQLITE_TRANSIENT);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1067,7 +1104,7 @@ static void timeFunc(
|
||||
){
|
||||
DateTime x;
|
||||
if( isDate(context, argc, argv, &x)==0 ){
|
||||
int s;
|
||||
int s, n;
|
||||
char zBuf[16];
|
||||
computeHMS(&x);
|
||||
zBuf[0] = '0' + (x.h/10)%10;
|
||||
@ -1076,11 +1113,24 @@ static void timeFunc(
|
||||
zBuf[3] = '0' + (x.m/10)%10;
|
||||
zBuf[4] = '0' + (x.m)%10;
|
||||
zBuf[5] = ':';
|
||||
s = (int)x.s;
|
||||
zBuf[6] = '0' + (s/10)%10;
|
||||
zBuf[7] = '0' + (s)%10;
|
||||
zBuf[8] = 0;
|
||||
sqlite3_result_text(context, zBuf, 8, SQLITE_TRANSIENT);
|
||||
if( x.useSubsec ){
|
||||
s = (int)1000.0*x.s;
|
||||
zBuf[6] = '0' + (s/10000)%10;
|
||||
zBuf[7] = '0' + (s/1000)%10;
|
||||
zBuf[8] = '.';
|
||||
zBuf[9] = '0' + (s/100)%10;
|
||||
zBuf[10] = '0' + (s/10)%10;
|
||||
zBuf[11] = '0' + (s)%10;
|
||||
zBuf[12] = 0;
|
||||
n = 12;
|
||||
}else{
|
||||
s = (int)x.s;
|
||||
zBuf[6] = '0' + (s/10)%10;
|
||||
zBuf[7] = '0' + (s)%10;
|
||||
zBuf[8] = 0;
|
||||
n = 8;
|
||||
}
|
||||
sqlite3_result_text(context, zBuf, n, SQLITE_TRANSIENT);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1211,8 +1261,13 @@ static void strftimeFunc(
|
||||
break;
|
||||
}
|
||||
case 's': {
|
||||
i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);
|
||||
sqlite3_str_appendf(&sRes,"%lld",iS);
|
||||
if( x.useSubsec ){
|
||||
sqlite3_str_appendf(&sRes,"%.3f",
|
||||
(x.iJD - 21086676*(i64)10000000)/1000.0);
|
||||
}else{
|
||||
i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);
|
||||
sqlite3_str_appendf(&sRes,"%lld",iS);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'S': {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user