HPCC-30969 Add missing JSON file type support and checks

Core library functionality.
hpcc-systems · Apr 30, 2024 · 646338d · 646338d
1 parent 54f70aa
commit 646338d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/ecl/hql/hqlerrors.hpp b/ecl/hql/hqlerrors.hpp
@@ -446,6 +446,7 @@
 #define ERR_FAIL_UPDATE_REPO        2407
 #define ERR_CANNOT_RESOLVE_BRANCH   2408
 #define ERR_UNKNOWN_EXCEPTION       2409
+#define ERR_INVALID_JSON_RECORD     2410
 
 #define ERR_CPP_COMPILE_ERROR       2999
 

diff --git a/ecl/hql/hqlgram2.cpp b/ecl/hql/hqlgram2.cpp
@@ -7282,6 +7282,9 @@ IHqlExpression * HqlGram::createBuildFileFromTable(IHqlExpression * table, const
     case no_xml:
         args.append(*createAttribute(xmlAtom, LINK(mode->queryChild(0))));
         break;
+    case no_json:
+        args.append(*createAttribute(jsonAtom, LINK(mode->queryChild(0))));
+        break;
     }
 
     ForEachItemIn(i, buildOptions)
@@ -8552,6 +8555,7 @@ void HqlGram::checkJoinFlags(const attribute &err, IHqlExpression * join)
                         {
                         case no_csv:
                         case no_xml:
+                        case no_json:
                             reportError(ERR_KEYEDNOTMATCHDATASET,err,"RIGHT side of a full keyed join must be a THOR disk file (CSV/XML) not currently supported");
                             break;
                         }
@@ -9030,6 +9034,10 @@ void HqlGram::checkValidRecordMode(IHqlExpression * dataset, attribute & atr, at
         if (!isValidXmlRecord(dataset->queryRecord()))
             reportError(ERR_INVALID_XML_RECORD, atr, "XML cannot be used on this record structure");
         break;
+    case no_json:
+        if (!isValidXmlRecord(dataset->queryRecord()))
+            reportError(ERR_INVALID_JSON_RECORD, atr, "JSON cannot be used on this record structure");
+        break;
     }
 }
 

diff --git a/ecl/hqlcpp/hqliproj.cpp b/ecl/hqlcpp/hqliproj.cpp
@@ -1927,6 +1927,7 @@ void ImplicitProjectTransformer::gatherFieldsUsed(IHqlExpression * expr, Implici
                 {
                 case no_csv:
                 case no_xml:
+                case no_json:
                     break;
                 default:
                     {