The floating-point-to-text conversion with the zero-padding option now

renders NaN as "null".

FossilOrigin-Name: ad59fa17663bda54ec5d4e48ac24e04b87daa70c795d840cd8db382e2dd581b9

diff --git a/manifest b/manifest
index ed02a965449b7d8395fb8e29969af1a291658e6d..8d94a9b1dac7cd6831f62584d053fdd349cc5a08 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sconsistency,\sthe\s".mode\sjson"\soutput\sfrom\sthe\sCLI\snow\srenders\sinfinity\nin\sthe\ssame\sformat\sas\sthe\sJSON\sfunctions.
-D 2023-03-22T16:37:17.803
+C The\sfloating-point-to-text\sconversion\swith\sthe\szero-padding\soption\snow\nrenders\sNaN\sas\s"null".
+D 2023-03-22T16:55:35.088
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -621,7 +621,7 @@ F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c c0c6e0735436e0e9e8d490f82959ddc9475d438e9f808a51953a4d43e30cea51
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c ce87a08cfddd45a147150db34190b1986f2d4a0e0828858cb6bd908c78fb02e3
-F src/printf.c 8c16d3783e87d5899c23a2736106dca11645b50e2c8606766d2d1446de278a0c
+F src/printf.c 7eac1a9896a80697e03e08963e210830532ae2ff610e16c193e95af007ca5623
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
@@ -2051,8 +2051,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 b52081d0acd07dc5bdb4951a3e8419866131965260c1e3a4c9b6e673bfe3dfea
-R 34b5c89a78ee207c15c2a2a6b01eb9c8
+P abee339d5eae8b63d9579b7ec3a25f18071e675223e0bb5294c733fb618a3a26
+R cb06c74e184cc2909674761792344766
 U drh
-Z 12d2d760264ba756a8188ada6c35650c
+Z a8c6d294d393530f190c714127c209f2
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b8db01212eda706ff2f0ae71fcea46983b1c7b9b..2b896cefb04cb18f4fda99c80ad6860523aa9262 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-abee339d5eae8b63d9579b7ec3a25f18071e675223e0bb5294c733fb618a3a26
\ No newline at end of file
+ad59fa17663bda54ec5d4e48ac24e04b87daa70c795d840cd8db382e2dd581b9
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index d59855917e617d4f6e87a869630a8e8ba9ba42e0..65e539befdbd1c11922dba753325f1972846e1ab 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -586,8 +586,13 @@ void sqlite3_str_vappendf(
             realvalue += rounder;
           }
           if( sqlite3IsNaN((double)realvalue) ){
-            bufpt = "NaN";
-            length = 3;
+            if( flag_zeropad ){
+              bufpt = "null";
+              length = 4;
+            }else{
+              bufpt = "NaN";
+              length = 3;
+            }
             break;
           }