For consistency, the ".mode json" output from the CLI now renders infinity

in the same format as the JSON functions.

FossilOrigin-Name: abee339d5eae8b63d9579b7ec3a25f18071e675223e0bb5294c733fb618a3a26

diff --git a/manifest b/manifest
index b032f01988be3b5d2931f4e064f5b066c9fe7b7d..ed02a965449b7d8395fb8e29969af1a291658e6d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sdouble-to-text\sconversion\srenders\sinfinity\sas\s9e999,\sso\sthat\sJSON\noutput\sis\scompliant\sand\sso\sthat\svalues\scan\sbe\sround-tripped.
-D 2023-03-22T16:24:17.609
+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
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 64a4b48a14f5d19a5ddc4afde37a435aebb92113f52653f8fe9e69fc3e9ff9aa
-F src/shell.c.in e66360191de42f8b43454886a059e3eb983e6dc0f2bd855dd4ff5244694f61a6
+F src/shell.c.in e92846a40dae4acd20ae6073846d8a54ba7fc84c8299af3b8d63be19491c5ad9
 F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2051,9 +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 c70a61d8fbfb722679398c211aa48ccd84a392a6b59ba70551fe3a9fbab9a6d5 efce4690a52592c4f5fc7d023eebe771b0e615bb03c0fe203493f853b28e8f85
-R 877d544aec0d825a0fa74ee8dc5a48fd
-T +closed efce4690a52592c4f5fc7d023eebe771b0e615bb03c0fe203493f853b28e8f85
+P b52081d0acd07dc5bdb4951a3e8419866131965260c1e3a4c9b6e673bfe3dfea
+R 34b5c89a78ee207c15c2a2a6b01eb9c8
 U drh
-Z e50ed26df279ddaf1f9de438f8e2a2a0
+Z 12d2d760264ba756a8188ada6c35650c
 # Remove this line to create a well-formed Fossil manifest.

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

diff --git a/src/shell.c.in b/src/shell.c.in
index b97889f9386ace652c6e7c9fc91d3a434b0b4d5e..340dc13ce2665abc8092afbbaa5f16d5394bd89d 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2523,9 +2523,9 @@ static int shell_callback(
           sqlite3_uint64 ur;
           memcpy(&ur,&r,sizeof(r));
           if( ur==0x7ff0000000000000LL ){
-            raw_printf(p->out, "1e999");
+            raw_printf(p->out, "9.0e+999");
           }else if( ur==0xfff0000000000000LL ){
-            raw_printf(p->out, "-1e999");
+            raw_printf(p->out, "-9.0e+999");
           }else{
             sqlite3_int64 ir = (sqlite3_int64)r;
             if( r==(double)ir ){
@@ -2569,9 +2569,9 @@ static int shell_callback(
           sqlite3_uint64 ur;
           memcpy(&ur,&r,sizeof(r));
           if( ur==0x7ff0000000000000LL ){
-            raw_printf(p->out, "1e999");
+            raw_printf(p->out, "9.0e+999");
           }else if( ur==0xfff0000000000000LL ){
-            raw_printf(p->out, "-1e999");
+            raw_printf(p->out, "-9.0e+999");
           }else{
             sqlite3_snprintf(50,z,"%!.20g", r);
             raw_printf(p->out, "%s", z);