Merge pull request #25452 from amosbird/jsonextractrawstring

JSONExtract String or Raw

src/Functions/FunctionsJSON.h

@@ -607,6 +607,8 @@ public:
     }
 };
 
+template <typename JSONParser>
+class JSONExtractRawImpl;
 
 /// Nodes of the extract tree. We need the extract tree to extract from JSON complex values containing array, tuples or nullables.
 template <typename JSONParser>
@@ -691,7 +693,10 @@ struct JSONExtractTree
     public:
         bool insertResultToColumn(IColumn & dest, const Element & element) override
         {
-            return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
+            if (element.isString())
+                return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
+            else
+                return JSONExtractRawImpl<JSONParser>::insertResultToColumn(dest, element, {});
         }
     };
 

tests/queries/0_stateless/00918_json_functions.reference

@@ -67,7 +67,7 @@ hello
 1234567890.12345677879616925706	(1234567890.12345677879616925706,'test')
 1234567890.123456695758468374595199311875	(1234567890.123456695758468374595199311875,'test')
 --JSONExtractKeysAndValues--
-[('a','hello')]
+[('a','hello'),('b','[-100,200,300]')]
 [('b',[-100,200,300])]
 [('a','hello'),('b','world')]
 [('a',5),('b',7),('c',11)]
@@ -170,7 +170,7 @@ Friday
 (3,5)
 (3,0)
 --JSONExtractKeysAndValues--
-[('a','hello')]
+[('a','hello'),('b','[-100,200,300]')]
 [('b',[-100,200,300])]
 [('a','hello'),('b','world')]
 [('a',5),('b',7),('c',11)]

tests/queries/0_stateless/01915_json_extract_raw_string.reference

@@ -0,0 +1 @@
+('123','456','[7,8,9]')

tests/queries/0_stateless/01915_json_extract_raw_string.sql

@@ -0,0 +1 @@
+select JSONExtract('{"a": "123", "b": 456, "c": [7, 8, 9]}', 'Tuple(a String, b String, c String)');