Skip to content

Commit 2732331

Browse files
committed
- 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
1 parent efe8067 commit 2732331

File tree

4 files changed

+366
-267
lines changed

4 files changed

+366
-267
lines changed

storage/connect/connect.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool reset, bool mrr)
404404
rc = RC_FX;
405405
} catch (const char *msg) {
406406
strcpy(g->Message, msg);
407+
rc = RC_NF;
407408
} // end catch
408409

409410
return rc;

storage/connect/tabdos.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class DllExport DOSDEF : public TABDEF { /* Logical table description */
2929
friend class TXTFAM;
3030
friend class DBFBASE;
3131
friend class UNZIPUTL;
32+
friend class JSONCOL;
3233
public:
3334
// Constructor
3435
DOSDEF(void);

0 commit comments

Comments
 (0)