- Fix a bug causing CONNECT to loop when expanding a JSON column

  when the expanded column value is null or void array.
- Adding the FullArray option to JSON tables.
- Skipping expanded JSON lines when the expanded column value is null.
  modified:   storage/connect/connect.cc
  modified:   storage/connect/tabdos.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

storage/connect/connect.cc

@@ -404,6 +404,7 @@ RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool reset, bool mrr)
 		rc = RC_FX;
 	} catch (const char *msg) {
 		strcpy(g->Message, msg);
+		rc = RC_NF;
 	} // end catch
 
   return rc;

storage/connect/tabdos.h

@@ -29,6 +29,7 @@ class DllExport DOSDEF : public TABDEF {  /* Logical table description */
   friend class TXTFAM;
   friend class DBFBASE;
 	friend class UNZIPUTL;
+	friend class JSONCOL;
  public:
   // Constructor
   DOSDEF(void);

storage/connect/tabjson.h

@@ -15,6 +15,7 @@ enum JMODE {MODE_OBJECT, MODE_ARRAY, MODE_VALUE};
 typedef class JSONDEF *PJDEF;
 typedef class TDBJSON *PJTDB;
 typedef class JSONCOL *PJCOL;
+class TDBJSN;
 
 /***********************************************************************/
 /*  The JSON tree node. Can be an Object or an Array.           	  	 */
@@ -29,6 +30,47 @@ typedef struct _jnode {
   int   Nx;                     // Next to read row number
 } JNODE, *PJNODE;
 
+typedef struct _jncol {
+	struct _jncol *Next;
+	char *Name;
+	char *Fmt;
+	int   Type;
+	int   Len;
+	int   Scale;
+	bool  Cbn;
+	bool  Found;
+} JCOL, *PJCL;
+
+/***********************************************************************/
+/*  Class used to get the columns of a mongo collection.               */
+/***********************************************************************/
+class JSONDISC : public BLOCK {
+public:
+	// Constructor
+	JSONDISC(PGLOBAL g, int *lg);
+
+	// Functions
+	int  GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt);
+	bool Find(PGLOBAL g, PJVAL jvp, int j);
+	void AddColumn(PGLOBAL g);
+
+	// Members
+	JCOL    jcol;
+	PJCL    jcp, fjcp, pjcp;
+	PVAL    valp;
+	PJDEF   tdp;
+	TDBJSN *tjnp;
+	PJTDB   tjsp;
+	PJPR    jpp;
+	PJSON   jsp;
+	PJOB    row;
+	PCSZ    sep;
+	char    colname[65], fmt[129], buf[16];
+	int    *length;
+	int     i, n, bf, ncol, lvl;
+	bool    all;
+}; // end of JSONDISC
+
 /***********************************************************************/
 /*  JSON table.                                                        */
 /***********************************************************************/
@@ -36,13 +78,13 @@ class DllExport JSONDEF : public DOSDEF {         /* Table description */
   friend class TDBJSON;
   friend class TDBJSN;
   friend class TDBJCL;
+	friend class JSONDISC;
 #if defined(CMGO_SUPPORT)
 	friend class CMGFAM;
 #endif   // CMGO_SUPPORT
 #if defined(JAVA_SUPPORT)
 	friend class JMGFAM;
 #endif   // JAVA_SUPPORT
-	friend PQRYRES JSONColumns(PGLOBAL, PCSZ, PCSZ, PTOS, bool);
 public:
   // Constructor
   JSONDEF(void);