Skip to content

Commit

Permalink
- Fix a bug causing CONNECT to loop when expanding a JSON column
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
Buggynours committed Feb 12, 2018
1 parent efe8067 commit 2732331
Show file tree
Hide file tree
Showing 4 changed files with 366 additions and 267 deletions.
1 change: 1 addition & 0 deletions storage/connect/connect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions storage/connect/tabdos.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 2732331

Please sign in to comment.