Fix some test failure

storage/connect/bson.h

+#pragma once
+/**************** bson H Declares Source Code File (.H) ****************/
+/*  Name: bson.h   Version 1.0                                         */
+/*                                                                     */
+/*  (C) Copyright to the author Olivier BERTRAND          2020         */
+/*                                                                     */
+/*  This file contains the BSON classe declares.                       */
+/***********************************************************************/
+#include <mysql_com.h>
+#include "json.h"
+#include "xobject.h"
+
+#if defined(_DEBUG)
+#define X  assert(false);
+#else
+#define X												  
+#endif
+
+class BDOC;
+class BOUT;
+//class JSON;
+
+typedef class BDOC* PBDOC;
+//typedef class BJSON* PBSON;
+
+// BSON size should be equal on Linux and Windows
+#define BMX 255
+
+typedef uint OFFSET;
+
+/***********************************************************************/
+/* Structure JVALUE.                                                   */
+/***********************************************************************/
+typedef struct _jvalue {
+	union {
+		OFFSET To_Val;    // Offset to a value
+		int    N;         // An integer value
+		float  F;				  // A float value
+		bool   B;				  // A boolean value True or false (0)
+	};
+	short    Nd;				// Number of decimals
+	JTYP     Type;      // The value type
+	OFFSET   Next;      // Offset to the next value in array
+} BVAL, *PBVAL;  // end of struct BVALUE
+
+/***********************************************************************/
+/* Structure JPAIR. The pairs of a json Object.                        */
+/***********************************************************************/
+typedef struct _jpair {
+	OFFSET Key;    // Offset to this pair key name
+	OFFSET Vlp;    // To the value of the pair
+	OFFSET Next;   // Offset to the next pair in object
+} BPAIR, *PBPR;  // end of struct BPAIR
+
+#if 0
+/***********************************************************************/
+/*  Structure used to return binary json to Json UDF functions.        */
+/*  (should be moved to jsonudf.h).                                    */
+/***********************************************************************/
+typedef struct _JsonBin {
+	char    Msg[BMX + 1];
+	char   *Filename;
+	PGLOBAL G;
+	int     Pretty;
+	ulong   Reslen;
+	my_bool Changed;
+	PBSON   Top;
+	PBSON   Jsp;
+	PBJN    Bsp;
+} BJSON, *PBJN ; // end of struct BJSON
+
+PBJN  JbinAlloc(PGLOBAL g, UDF_ARGS* args, ulong len, PJSON jsp);
+#endif // 0
+
+char* NextChr(PSZ s, char sep);
+char* GetJsonNull(void);
+const char* GetFmt(int type, bool un);
+
+DllExport bool IsNum(PSZ s);
+
+/***********************************************************************/
+/* Class JDOC. The class for parsing and serializing json documents.   */
+/***********************************************************************/
+class BDOC : public BLOCK {
+public:
+	BDOC(void);
+
+	void *BsonSubAlloc(PGLOBAL g, size_t size);
+	PBPR  SubAllocPair(PGLOBAL g, OFFSET key);
+	PBVAL SubAllocVal(PGLOBAL g);
+	PBVAL ParseJson(PGLOBAL g, char* s, size_t n, int* prty = NULL, bool* b = NULL);
+	PSZ   Serialize(PGLOBAL g, PBVAL bvp, char* fn, int pretty);
+
+protected:
+	OFFSET ParseArray(PGLOBAL g, int& i);
+	OFFSET ParseObject(PGLOBAL g, int& i);
+	PBVAL  ParseValue(PGLOBAL g, int& i);
+	OFFSET ParseString(PGLOBAL g, int& i);
+	void   ParseNumeric(PGLOBAL g, int& i, PBVAL bvp);
+	OFFSET ParseAsArray(PGLOBAL g, int& i, int pretty, int* ptyp);
+	bool  SerializeArray(OFFSET arp, bool b);
+	bool  SerializeObject(OFFSET obp);
+	bool  SerializeValue(PBVAL vp);
+
+	// Members used when parsing and serializing
+private:
+	JOUT* jp;						 // Used with serialize
+	void* base;          // The base for making offsets or pointers
+	char* s;						 // The Json string to parse
+	int   len;					 // The Json string length
+	bool  pty[3];					 // Used to guess what pretty is
+}; // end of class BDOC
+
+#if 0
+/***********************************************************************/
+/* Class BJSON. The class handling all BSON operations.                */
+/***********************************************************************/
+class BJSON : public BLOCK {
+public:
+	// Constructor
+	BJSON(PBVAL vp, void* base) { Vlp = vp; Base = base; }
+
+	// Array functions
+	int   GetSize(bool b);
+	PBVAL GetArrayValue(int i);
+	PSZ   GetText(PGLOBAL g, PSTRG text);
+	bool  Merge(PGLOBAL g, PBVAL jsp);
+	bool  DeleteValue(int n);
+	PBVAL AddArrayValue(PGLOBAL g, PBVAL jvp = NULL, int* x = NULL);
+	bool  SetArrayValue(PGLOBAL g, PBVAL jvp, int i);
+
+	// Object functions
+	int   GetObjectSize(PBPR prp, bool b);
+	PSZ   GetObjectText(PGLOBAL g, PBPR prp, PSTRG text);
+	bool  MergeObject(PGLOBAL g, PBPR prp);
+ 	PJPR  AddPair(PGLOBAL g, PCSZ key);
+	PJVAL GetKeyValue(const char* key);
+	PJAR  GetKeyList(PGLOBAL g);
+	PJAR  GetValList(PGLOBAL g);
+	void  SetKeyValue(PGLOBAL g, PBVAL jvp, PCSZ key);
+	void  DeleteKey(PCSZ k);
+
+	// Value functions
+	PBPR  GetObject(void);
+	PBVAL GetArray(void);
+	PJSON GetJsp(void) { return (DataType == TYPE_JSON ? Jsp : NULL); }
+	PSZ   GetValueText(PGLOBAL g, PSTRG text);
+	inline PJSON  GetJson(void) { return (DataType == TYPE_JSON ? Jsp : this); }
+	PSZ   GetString(PGLOBAL g, char* buff = NULL);
+	int   GetInteger(void);
+	long long GetBigint(void);
+	double GetFloat(void);
+	PVAL  GetValue(PGLOBAL g);
+	void  SetValue(PJSON jsp);
+	void  SetValue(PGLOBAL g, PVAL valp);
+	void  SetString(PGLOBAL g, PSZ s, int ci = 0);
+	void  SetInteger(PGLOBAL g, int n);
+	void  SetBigint(PGLOBAL g, longlong ll);
+	void  SetFloat(PGLOBAL g, double f);
+	void  SetBool(PGLOBAL g, bool b);
+
+	// Members
+	PBVAL Vlp;
+	void* Base;
+}; // end of class BJSON
+
+/***********************************************************************/
+/* Class JOBJECT: contains a list of value pairs.                      */
+/***********************************************************************/
+class JOBJECT : public JSON {
+	friend class JDOC;
+	friend class JSNX;
+	friend class SWAP;
+public:
+	JOBJECT(void) : JSON() { Type = TYPE_JOB; First = Last = NULL; }
+	JOBJECT(int i) : JSON(i) {}
+
+	// Methods
+	virtual void  Clear(void) { First = Last = NULL; }
+	virtual PJPR  GetFirst(void) { return First; }
+	virtual int   GetSize(PBPR prp, bool b);
+	virtual PJOB  GetObject(void) { return this; }
+	virtual PSZ   GetText(PGLOBAL g, PSTRG text);
+	virtual bool  Merge(PGLOBAL g, PJSON jsp);
+	virtual bool  IsNull(void);
+
+	// Specific
+	PJPR  AddPair(PGLOBAL g, PCSZ key);
+	PJVAL GetKeyValue(const char* key);
+	PJAR  GetKeyList(PGLOBAL g);
+	PJAR  GetValList(PGLOBAL g);
+	void  SetKeyValue(PGLOBAL g, PJVAL jvp, PCSZ key);
+	void  DeleteKey(PCSZ k);
+
+protected:
+	PJPR First;
+	PJPR Last;
+}; // end of class JOBJECT
+
+/***********************************************************************/
+/* Class JARRAY.                                                       */
+/***********************************************************************/
+class JARRAY : public JSON {
+	friend class SWAP;
+public:
+	JARRAY(void);
+	JARRAY(int i) : JSON(i) {}
+
+	// Methods
+	virtual void  Clear(void) { First = Last = NULL; Size = 0; }
+	virtual int   size(void) { return Size; }
+	virtual PJAR  GetArray(void) { return this; }
+	virtual int   GetSize(bool b);
+	virtual PJVAL GetArrayValue(int i);
+	virtual PSZ   GetText(PGLOBAL g, PSTRG text);
+	virtual bool  Merge(PGLOBAL g, PJSON jsp);
+	virtual bool  DeleteValue(int n);
+	virtual bool  IsNull(void);
+
+	// Specific
+	PJVAL AddArrayValue(PGLOBAL g, PJVAL jvp = NULL, int* x = NULL);
+	bool  SetArrayValue(PGLOBAL g, PJVAL jvp, int i);
+	void  InitArray(PGLOBAL g);
+
+protected:
+	// Members
+	int    Size;		 // The number of items in the array
+	int    Alloc;    // The Mvals allocated size
+	PJVAL  First;    // Used when constructing
+	PJVAL  Last;     // Last constructed value
+	PJVAL* Mvals;    // Allocated when finished
+}; // end of class JARRAY
+
+/***********************************************************************/
+/* Class JVALUE.                                                       */
+/***********************************************************************/
+class JVALUE : public JSON {
+	friend class JARRAY;
+	friend class JSNX;
+	friend class JSONDISC;
+	friend class JSONCOL;
+	friend class JSON;
+	friend class JDOC;
+	friend class SWAP;
+public:
+	JVALUE(void) : JSON() { Type = TYPE_JVAL; Clear(); }
+	JVALUE(PJSON jsp);
+	JVALUE(PGLOBAL g, PVAL valp);
+	JVALUE(PGLOBAL g, PCSZ strp);
+	JVALUE(int i) : JSON(i) {}
+
+	// Methods
+	virtual void   Clear(void);
+	//virtual JTYP   GetType(void) {return TYPE_JVAL;}
+	virtual JTYP   GetValType(void);
+	virtual PJOB   GetObject(void);
+	virtual PJAR   GetArray(void);
+	virtual PJSON  GetJsp(void) { return (DataType == TYPE_JSON ? Jsp : NULL); }
+	virtual PSZ    GetText(PGLOBAL g, PSTRG text);
+	virtual bool   IsNull(void);
+
+	// Specific
+	inline PJSON  GetJson(void) { return (DataType == TYPE_JSON ? Jsp : this); }
+	PSZ    GetString(PGLOBAL g, char* buff = NULL);
+	int    GetInteger(void);
+	long long GetBigint(void);
+	double GetFloat(void);
+	PVAL   GetValue(PGLOBAL g);
+	void   SetValue(PJSON jsp);
+	void   SetValue(PGLOBAL g, PVAL valp);
+	void   SetString(PGLOBAL g, PSZ s, int ci = 0);
+	void   SetInteger(PGLOBAL g, int n);
+	void   SetBigint(PGLOBAL g, longlong ll);
+	void   SetFloat(PGLOBAL g, double f);
+	void   SetBool(PGLOBAL g, bool b);
+
+protected:
+	union {
+		PJSON  Jsp;       // To the json value
+		char* Strp;      // Ptr to a string
+		int    N;         // An integer value
+		long long LLn;		 // A big integer value
+		double F;				 // A (double) float value
+		bool   B;				 // True or false
+	};
+	PJVAL Next;     // Next value in array
+	JTYP  DataType; // The data value type
+	int   Nd;				// Decimal number
+	bool  Del;      // True when deleted
+}; // end of class JVALUE
+#endif // 0

storage/connect/json.h

@@ -15,18 +15,22 @@
 #define X
 #endif
 
-enum JTYP {TYPE_NULL = TYPE_VOID,
-					 TYPE_STRG = TYPE_STRING, 
-           TYPE_DBL  = TYPE_DOUBLE,
-           TYPE_BOOL = TYPE_TINY,
-           TYPE_BINT = TYPE_BIGINT,
-					 TYPE_DTM  = TYPE_DATE,
-					 TYPE_INTG = TYPE_INT,
-					 TYPE_VAL  = 12,
-					 TYPE_JSON,
-           TYPE_JAR, 
-           TYPE_JOB, 
-           TYPE_JVAL};
+enum JTYP : short {
+	TYPE_NULL = TYPE_VOID,
+	TYPE_STRG = TYPE_STRING,
+	TYPE_DBL = TYPE_DOUBLE,
+	TYPE_BOOL = TYPE_TINY,
+	TYPE_BINT = TYPE_BIGINT,
+	TYPE_INTG = TYPE_INT,
+	TYPE_DTM = TYPE_DATE,
+	TYPE_FLOAT,
+	TYPE_JAR,
+	TYPE_JOB,
+	TYPE_JVAL,
+	TYPE_JSON,
+	TYPE_DEL,
+	TYPE_UNKNOWN
+};
 
 class JDOC;
 class JOUT;

storage/connect/jsonudf.cpp

@@ -1252,9 +1252,9 @@ static PJVAL JvalNew(PGLOBAL g, JTYP type, void *vp)
 			case TYPE_JOB:
 				jvp = new(g) JVALUE((PJSON)vp);
 				break;
-			case TYPE_VAL:
-				jvp = new(g) JVALUE(g, (PVAL)vp);
-				break;
+//		case TYPE_VAL:
+//			jvp = new(g) JVALUE(g, (PVAL)vp);
+//			break;
 			case TYPE_DTM:
 			case TYPE_STRG:
 				jvp = new(g) JVALUE(g, (PCSZ)vp);
@@ -5376,7 +5376,7 @@ char *jbin_get_item(UDF_INIT *initid, UDF_ARGS *args, char *result,
 
 	// Get the json tree
 	if ((jvp = jsx->GetRowValue(g, jsp, 0, false))) {
-		jsp = (jvp->GetJsp()) ? jvp->GetJsp() : JvalNew(g, TYPE_VAL, jvp->GetValue(g));
+		jsp = (jvp->GetJsp()) ? jvp->GetJsp() : JvalNew(g, TYPE_JVAL, jvp->GetValue(g));
 
 		if ((bsp = JbinAlloc(g, args, initid->max_length, jsp)))
 			strcat(bsp->Msg, " item");

storage/connect/jsonudf.h

@@ -10,7 +10,7 @@
 #include "block.h"
 #include "osutil.h"
 #include "maputil.h"
-#include "json.h"
+#include "bson.h"
 
 #define UDF_EXEC_ARGS \
   UDF_INIT*, UDF_ARGS*, char*, unsigned long*, char*, char*

storage/connect/myutil.cpp

@@ -168,10 +168,9 @@ const char *PLGtoMYSQLtype(int type, bool dbf, char v)
     case TYPE_BIGINT:   return "BIGINT";
     case TYPE_TINY:     return "TINYINT";
     case TYPE_DECIM:    return "DECIMAL";
-    default:            return "CHAR(0)";
+    default:            return (v) ? "VARCHAR" : "CHAR";
     } // endswitch mytype
 
-  return "CHAR(0)";
   } // end of PLGtoMYSQLtype
 
 /************************************************************************/

storage/connect/tabfmt.cpp

@@ -67,7 +67,7 @@
 /*  This should be an option.                                          */
 /***********************************************************************/
 #define MAXCOL          200        /* Default max column nb in result  */
-#define TYPE_UNKNOWN     10        /* Must be greater than other types */
+#define TYPE_UNKNOWN     12        /* Must be greater than other types */
 
 /***********************************************************************/
 /*  External function.                                                 */

storage/connect/tabjson.cpp

@@ -46,7 +46,7 @@
 /*  This should be an option.                                          */
 /***********************************************************************/
 #define MAXCOL          200        /* Default max column nb in result  */
-#define TYPE_UNKNOWN     12        /* Must be greater than other types */
+//#define TYPE_UNKNOWN     12        /* Must be greater than other types */
 
 /***********************************************************************/
 /*  External functions.                                                */
@@ -114,7 +114,7 @@ PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info)
   /*********************************************************************/
   for (i = 0, jcp = pjdc->fjcp; jcp; i++, jcp = jcp->Next) {
     if (jcp->Type == TYPE_UNKNOWN)
-      jcp->Type = TYPE_STRING;             // Void column
+      jcp->Type = TYPE_STRG;               // Void column
 
     crp = qrp->Colresp;                    // Column Name
     crp->Kdata->SetValue(jcp->Name, i);
@@ -395,7 +395,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
   PJAR   jar;
 
   if (jvp && jvp->DataType != TYPE_JSON) {
-		if (JsonAllPath() && !fmt[bf])
+		if (JsonAllPath() && !fmt[bf])                                  
 			strcat(fmt, colname);
 
 		jcol.Type = jvp->DataType;
@@ -506,7 +506,7 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
 		}	else if (JsonAllPath() && !fmt[bf])
 			strcat(fmt, colname);
 
-		jcol.Type = TYPE_STRING;
+		jcol.Type = TYPE_STRG;
     jcol.Len = sz;
     jcol.Scale = 0;
     jcol.Cbn = true;
@@ -528,23 +528,23 @@ void JSONDISC::AddColumn(PGLOBAL g)
 
   if (jcp) {
     if (jcp->Type != jcol.Type) {
-      if (jcp->Type == TYPE_UNKNOWN || jcol.Type == TYPE_VOID)
+      if (jcp->Type == TYPE_UNKNOWN || jcp->Type == TYPE_NULL)
         jcp->Type = jcol.Type;
 //    else if (jcol.Type != TYPE_UNKNOWN && jcol.Type != TYPE_VOID)
 //      jcp->Type = TYPE_STRING;
-      else if (jcp->Type != TYPE_STRING)
+      else if (jcp->Type != TYPE_STRG)
         switch (jcol.Type) {
-        case TYPE_STRING:
-        case TYPE_DOUBLE:
+        case TYPE_STRG:
+        case TYPE_DBL:
           jcp->Type = jcol.Type;
           break;
-        case TYPE_BIGINT:
-          if (jcp->Type == TYPE_INT || jcp->Type == TYPE_TINY)
+        case TYPE_BINT:
+          if (jcp->Type == TYPE_INTG || jcp->Type == TYPE_BOOL)
             jcp->Type = jcol.Type;
 
           break;
-        case TYPE_INT:
-          if (jcp->Type == TYPE_TINY)
+        case TYPE_INTG:
+          if (jcp->Type == TYPE_BOOL)
             jcp->Type = jcol.Type;
 
           break;

storage/connect/tabjson.h

@@ -35,7 +35,7 @@ typedef struct _jncol {
 	struct _jncol *Next;
 	char *Name;
 	char *Fmt;
-	int   Type;
+	JTYP  Type;
 	int   Len;
 	int   Scale;
 	bool  Cbn;