Changeset: 4ffac7fdf1f0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ffac7fdf1f0
Added Files:
sql/test/json/Tests/jsonnumber.Bug-6932.stable.err
sql/test/json/Tests/jsonnumber.Bug-6932.stable.out
Modified Files:
monetdb5/modules/atoms/json.c
Branch: Jun2020
Log Message:
Add fix for Bug-6932
diffs (76 lines):
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -838,14 +838,12 @@ JSONnumberParser(const char *j, const ch
if (!JSONfractionParser(j, next)) {
*next = j;
- return MAL_SUCCEED;
}
j = *next;
if (!JSONexponentParser(j, next)) {
*next = j;
- return MAL_SUCCEED;
}
return MAL_SUCCEED;
}
diff --git a/sql/test/json/Tests/jsonnumber.Bug-6932.stable.err
b/sql/test/json/Tests/jsonnumber.Bug-6932.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/json/Tests/jsonnumber.Bug-6932.stable.err
@@ -0,0 +1,12 @@
+stderr of test 'jsonnumber.Bug-6932` in directory 'sql/test/json` itself:
+
+
+# 19:01:51 >
+# 19:01:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-805686" "--port=35911"
+# 19:01:51 >
+
+
+# 19:01:51 >
+# 19:01:51 > "Done."
+# 19:01:51 >
+
diff --git a/sql/test/json/Tests/jsonnumber.Bug-6932.stable.out
b/sql/test/json/Tests/jsonnumber.Bug-6932.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/json/Tests/jsonnumber.Bug-6932.stable.out
@@ -0,0 +1,36 @@
+stdout of test 'jsonnumber.Bug-6932` in directory 'sql/test/json` itself:
+
+
+# 19:01:51 >
+# 19:01:51 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-805686" "--port=35911"
+# 19:01:51 >
+
+#SELECT json.isValid('[0.1e12]');
+% .%2 # table_name
+% %2 # name
+% boolean # type
+% 5 # length
+[ true ]
+#SELECT json.isValid('[1e12]');
+% .%2 # table_name
+% %2 # name
+% boolean # type
+% 5 # length
+[ true ]
+#SELECT json.isValid('{"foo":1e12}');
+% .%2 # table_name
+% %2 # name
+% boolean # type
+% 5 # length
+[ true ]
+#SELECT json.number(json.filter('{"foo":1e3}', '$.foo'));
+% .%2 # table_name
+% %2 # name
+% double # type
+% 24 # length
+[ 1000 ]
+
+# 19:01:51 >
+# 19:01:51 > "Done."
+# 19:01:51 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
