Skip to content

M
MariaDB
Commit a82171c9 authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

In BIN table date_format now imply by default field_format='C'. 

  modified:   storage/connect/tabfix.cpp
  modified:   storage/connect/reldef.cpp

Json array index (position) is now 0 based by default. This corresponds
to what all json applications and functions do. Also fix ROWNUM calculation.
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/r/json.result
  modified:   storage/connect/mysql-test/connect/t/json.test
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
parent b9c91090
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 324 deletions
storage/connect/jsonudf.cpp
View file @ a82171c9
...@@ -410,7 +410,7 @@ void Json_Array_Add_deinit(UDF_INIT* initid) ...@@ -410,7 +410,7 @@ void Json_Array_Add_deinit(UDF_INIT* initid)
} // end of Json_Array_Add_deinit } // end of Json_Array_Add_deinit
/***********************************************************************/ /***********************************************************************/
/* Add values to a Json array. */ /* Delete a value from a Json array. */
/***********************************************************************/ /***********************************************************************/
my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message) my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
{ {
...@@ -451,7 +451,7 @@ char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result, ...@@ -451,7 +451,7 @@ char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result,
} else { } else {
n = *(int*)args->args[1]; n = *(int*)args->args[1];
arp = jvp->GetArray(); arp = jvp->GetArray();
arp->DeleteValue(n - 1); arp->DeleteValue(n);
arp->InitArray(g); arp->InitArray(g);
if (!(str = Serialize(g, arp, NULL, 0))) { if (!(str = Serialize(g, arp, NULL, 0))) {
......
storage/connect/mysql-test/connect/r/json.result
View file @ a82171c9
...@@ -97,7 +97,7 @@ ISBN Language Subject AuthorFN AuthorLN Title Translation Translator Publisher L ...@@ -97,7 +97,7 @@ ISBN Language Subject AuthorFN AuthorLN Title Translation Translator Publisher L
CREATE TABLE t2 ( CREATE TABLE t2 (
FIRSTNAME CHAR(32), FIRSTNAME CHAR(32),
LASTNAME CHAR(32)) LASTNAME CHAR(32))
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.json' OPTION_LIST='Object=[2]:AUTHOR'; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='biblio.json' OPTION_LIST='Object=[1]:AUTHOR';
SELECT * FROM t2; SELECT * FROM t2;
FIRSTNAME LASTNAME FIRSTNAME LASTNAME
William J. Pardi William J. Pardi
...@@ -252,9 +252,9 @@ DROP TABLE t1; ...@@ -252,9 +252,9 @@ DROP TABLE t1;
# #
CREATE TABLE t2 ( CREATE TABLE t2 (
WHO CHAR(12), WHO CHAR(12),
WEEK INT(2) FIELD_FORMAT='WEEK:[1]:NUMBER', WEEK INT(2) FIELD_FORMAT='WEEK:[0]:NUMBER',
WHAT CHAR(32) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:WHAT', WHAT CHAR(32) FIELD_FORMAT='WEEK:[0]:EXPENSE:[X]:WHAT',
AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:AMOUNT') AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[0]:EXPENSE:[X]:AMOUNT')
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json'; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json';
SELECT * FROM t2; SELECT * FROM t2;
WHO WEEK WHAT AMOUNT WHO WEEK WHAT AMOUNT
...@@ -268,9 +268,9 @@ Janet 3 Food 18.00 ...@@ -268,9 +268,9 @@ Janet 3 Food 18.00
Janet 3 Beer 18.00 Janet 3 Beer 18.00
CREATE TABLE t3 ( CREATE TABLE t3 (
WHO CHAR(12), WHO CHAR(12),
WEEK INT(2) FIELD_FORMAT='WEEK:[2]:NUMBER', WEEK INT(2) FIELD_FORMAT='WEEK:[1]:NUMBER',
WHAT CHAR(32) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:WHAT', WHAT CHAR(32) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:WHAT',
AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:AMOUNT') AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[1]:EXPENSE:[X]:AMOUNT')
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json'; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json';
SELECT * FROM t3; SELECT * FROM t3;
WHO WEEK WHAT AMOUNT WHO WEEK WHAT AMOUNT
...@@ -284,9 +284,9 @@ Beth 4 Beer 15.00 ...@@ -284,9 +284,9 @@ Beth 4 Beer 15.00
Janet 4 Car 17.00 Janet 4 Car 17.00
CREATE TABLE t4 ( CREATE TABLE t4 (
WHO CHAR(12), WHO CHAR(12),
WEEK INT(2) FIELD_FORMAT='WEEK:[3]:NUMBER', WEEK INT(2) FIELD_FORMAT='WEEK:[2]:NUMBER',
WHAT CHAR(32) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:WHAT', WHAT CHAR(32) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:WHAT',
AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[3]:EXPENSE:[X]:AMOUNT') AMOUNT DOUBLE(8,2) FIELD_FORMAT='WEEK:[2]:EXPENSE:[X]:AMOUNT')
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json'; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='expense.json';
SELECT * FROM t4; SELECT * FROM t4;
WHO WEEK WHAT AMOUNT WHO WEEK WHAT AMOUNT
......
storage/connect/reldef.cpp
View file @ a82171c9
...@@ -333,7 +333,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g) ...@@ -333,7 +333,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g)
if (nof) if (nof)
// Field width is the internal representation width // Field width is the internal representation width
// that can also depend on the column format // that can also depend on the column format
switch (cdp->Fmt ? *cdp->Fmt : 'X') { switch (cdp->Fmt ? *cdp->Fmt : cdp->Decode ? 'C' : 'X') {
case 'X': nof= cdp->Clen; case 'X': nof= cdp->Clen;
case 'C': break; case 'C': break;
case 'R': case 'R':
...@@ -346,7 +346,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g) ...@@ -346,7 +346,7 @@ int TABDEF::GetColCatInfo(PGLOBAL g)
default: /* New format */ default: /* New format */
for (nof= 0, i= 0; cdp->Fmt[i]; i++) for (nof= 0, i= 0; cdp->Fmt[i]; i++)
if (isdigit(cdp->Fmt[i])) if (isdigit(cdp->Fmt[i]))
nof= (nof * 10 + (cdp->Fmt[i] - 48)); nof= (nof * 10 + (cdp->Fmt[i] - '0'));
if (!nof) if (!nof)
nof= cdp->Clen; nof= cdp->Clen;
...@@ -377,20 +377,16 @@ int TABDEF::GetColCatInfo(PGLOBAL g) ...@@ -377,20 +377,16 @@ int TABDEF::GetColCatInfo(PGLOBAL g)
// not specified (for instance if quoted is specified) // not specified (for instance if quoted is specified)
// if ((ending= Hc->GetIntegerOption("Ending")) < 0) { // if ((ending= Hc->GetIntegerOption("Ending")) < 0) {
if ((ending= Hc->GetIntegerOption("Ending")) <= 0) { if ((ending= Hc->GetIntegerOption("Ending")) <= 0) {
#if defined(WIN32) ending= (tc == TAB_BIN || tc == TAB_VEC) ? 0 : CRLF;
ending= 2;
#else
ending= 1;
#endif
Hc->SetIntegerOption("Ending", ending); Hc->SetIntegerOption("Ending", ending);
} // endif ending } // endif ending
// Calculate the default record size // Calculate the default record size
switch (tc) { switch (tc) {
case TAB_FIX: case TAB_FIX:
case TAB_BIN:
recln= nlg + ending; // + length of line ending recln= nlg + ending; // + length of line ending
break; break;
case TAB_BIN:
case TAB_VEC: case TAB_VEC:
recln= nlg; recln= nlg;
......
storage/connect/tabfix.cpp
View file @ a82171c9
...@@ -385,7 +385,7 @@ BINCOL::BINCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am) ...@@ -385,7 +385,7 @@ BINCOL::BINCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am)
for (N = 0, i = 0; fmt[i]; i++) for (N = 0, i = 0; fmt[i]; i++)
if (isdigit(fmt[i])) if (isdigit(fmt[i]))
N = (N * 10 + (fmt[i] - 48)); N = (N * 10 + (fmt[i] - '0'));
else else
Fmt = toupper(fmt[i]); Fmt = toupper(fmt[i]);
...@@ -408,7 +408,7 @@ BINCOL::BINCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am) ...@@ -408,7 +408,7 @@ BINCOL::BINCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am)
} else { } else {
N = 0; N = 0;
Fmt = 'X'; Fmt = GetDomain() ? 'C' : 'X';
} // endif fmt } // endif fmt
} // end of BINCOL constructor } // end of BINCOL constructor
......
storage/connect/tabjson.cpp
View file @ a82171c9
...@@ -372,6 +372,7 @@ bool JSONDEF::DefineAM(PGLOBAL g, LPCSTR, int poff) ...@@ -372,6 +372,7 @@ bool JSONDEF::DefineAM(PGLOBAL g, LPCSTR, int poff)
Pretty = GetIntCatInfo("Pretty", 2); Pretty = GetIntCatInfo("Pretty", 2);
Level = GetIntCatInfo("Level", 0); Level = GetIntCatInfo("Level", 0);
Limit = GetIntCatInfo("Limit", 10); Limit = GetIntCatInfo("Limit", 10);
Base = GetIntCatInfo("Base", 0);
return DOSDEF::DefineAM(g, "DOS", poff); return DOSDEF::DefineAM(g, "DOS", poff);
} // end of DefineAM } // end of DefineAM
...@@ -440,6 +441,7 @@ TDBJSN::TDBJSN(PJDEF tdp, PTXF txfp) : TDBDOS(tdp, txfp) ...@@ -440,6 +441,7 @@ TDBJSN::TDBJSN(PJDEF tdp, PTXF txfp) : TDBDOS(tdp, txfp)
Xcol = tdp->Xcol; Xcol = tdp->Xcol;
Limit = tdp->Limit; Limit = tdp->Limit;
Pretty = tdp->Pretty; Pretty = tdp->Pretty;
B = tdp->Base ? 1 : 0;
Strict = tdp->Strict; Strict = tdp->Strict;
} else { } else {
Jmode = MODE_OBJECT; Jmode = MODE_OBJECT;
...@@ -447,11 +449,12 @@ TDBJSN::TDBJSN(PJDEF tdp, PTXF txfp) : TDBDOS(tdp, txfp) ...@@ -447,11 +449,12 @@ TDBJSN::TDBJSN(PJDEF tdp, PTXF txfp) : TDBDOS(tdp, txfp)
Xcol = NULL; Xcol = NULL;
Limit = 1; Limit = 1;
Pretty = 0; Pretty = 0;
B = 1;
Strict = false; Strict = false;
} // endif tdp } // endif tdp
Fpos = -1; Fpos = -1;
N = 0; N = M = 0;
NextSame = 0; NextSame = 0;
SameRow = 0; SameRow = 0;
Xval = -1; Xval = -1;
...@@ -469,6 +472,7 @@ TDBJSN::TDBJSN(TDBJSN *tdbp) : TDBDOS(NULL, tdbp) ...@@ -469,6 +472,7 @@ TDBJSN::TDBJSN(TDBJSN *tdbp) : TDBDOS(NULL, tdbp)
Xcol = tdbp->Xcol; Xcol = tdbp->Xcol;
Fpos = tdbp->Fpos; Fpos = tdbp->Fpos;
N = tdbp->N; N = tdbp->N;
M = tdbp->M;
Limit = tdbp->Limit; Limit = tdbp->Limit;
NextSame = tdbp->NextSame; NextSame = tdbp->NextSame;
SameRow = tdbp->SameRow; SameRow = tdbp->SameRow;
...@@ -563,7 +567,7 @@ PJSON TDBJSN::FindRow(PGLOBAL g) ...@@ -563,7 +567,7 @@ PJSON TDBJSN::FindRow(PGLOBAL g)
jsp->GetObject()->GetValue(objpath) : NULL; jsp->GetObject()->GetValue(objpath) : NULL;
} else if (objpath[strlen(objpath)-1] == ']') { } else if (objpath[strlen(objpath)-1] == ']') {
val = (jsp->GetType() == TYPE_JAR) ? val = (jsp->GetType() == TYPE_JAR) ?
jsp->GetArray()->GetValue(atoi(objpath+1) - 1) : NULL; jsp->GetArray()->GetValue(atoi(objpath+1) - B) : NULL;
} else } else
val = NULL; val = NULL;
...@@ -649,6 +653,7 @@ int TDBJSN::ReadDB(PGLOBAL g) ...@@ -649,6 +653,7 @@ int TDBJSN::ReadDB(PGLOBAL g)
if (NextSame) { if (NextSame) {
SameRow = NextSame; SameRow = NextSame;
NextSame = 0; NextSame = 0;
M++;
return RC_OK; return RC_OK;
} else if ((rc = TDBDOS::ReadDB(g)) == RC_OK) } else if ((rc = TDBDOS::ReadDB(g)) == RC_OK)
if (!IsRead() && ((rc = ReadBuffer(g)) != RC_OK)) { if (!IsRead() && ((rc = ReadBuffer(g)) != RC_OK)) {
...@@ -660,6 +665,7 @@ int TDBJSN::ReadDB(PGLOBAL g) ...@@ -660,6 +665,7 @@ int TDBJSN::ReadDB(PGLOBAL g)
Row = FindRow(g); Row = FindRow(g);
SameRow = 0; SameRow = 0;
Fpos++; Fpos++;
M = 1;
rc = RC_OK; rc = RC_OK;
} // endif's } // endif's
...@@ -708,7 +714,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp) ...@@ -708,7 +714,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
val->SetValue(arp); val->SetValue(arp);
val = new(g) JVALUE; val = new(g) JVALUE;
i = atoi(objpath+1) - 1; i = atoi(objpath+1) - B;
arp->SetValue(g, val, i); arp->SetValue(g, val, i);
arp->InitArray(g); arp->InitArray(g);
} else { } else {
...@@ -856,8 +862,8 @@ bool JSONCOL::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm) ...@@ -856,8 +862,8 @@ bool JSONCOL::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm)
return true; return true;
else if (jnp->Op != OP_EXP) { else if (jnp->Op != OP_EXP) {
if (b) { if (b) {
// Return 1st value // Return 1st value (B is the index base)
jnp->Rank = 1; jnp->Rank = 1 - Tjp->B;
jnp->Op = OP_EQ; jnp->Op = OP_EQ;
} else if (!Value->IsTypeNum()) { } else if (!Value->IsTypeNum()) {
jnp->CncVal = AllocateValue(g, (void*)", ", TYPE_STRING); jnp->CncVal = AllocateValue(g, (void*)", ", TYPE_STRING);
...@@ -868,13 +874,9 @@ bool JSONCOL::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm) ...@@ -868,13 +874,9 @@ bool JSONCOL::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm)
} // endif OP } // endif OP
} else if (dg) { } else if (dg) {
if (atoi(p) > 0) { // Return nth value
// Return nth value jnp->Rank = atoi(p) - Tjp->B;
jnp->Rank = atoi(p); jnp->Op = OP_EQ;
jnp->Op = OP_EQ;
} else // Ignore array
jnp->Op = OP_NULL;
} else if (n == 1) { } else if (n == 1) {
// Set the Op value; // Set the Op value;
switch (*p) { switch (*p) {
...@@ -1118,16 +1120,12 @@ PVAL JSONCOL::GetColumnValue(PGLOBAL g, PJSON row, int i) ...@@ -1118,16 +1120,12 @@ PVAL JSONCOL::GetColumnValue(PGLOBAL g, PJSON row, int i)
arp = (PJAR)row; arp = (PJAR)row;
if (!Nodes[i].Key) { if (!Nodes[i].Key) {
if (Nodes[i].Op != OP_NULL) { if (Nodes[i].Op == OP_EQ)
if (Nodes[i].Rank) { val = arp->GetValue(Nodes[i].Rank);
val = arp->GetValue(Nodes[i].Rank - 1); else if (Nodes[i].Op == OP_EXP)
} else if (Nodes[i].Op == OP_EXP) { return ExpandArray(g, arp, i);
return ExpandArray(g, arp, i); else
} else return CalculateArray(g, arp, i);
return CalculateArray(g, arp, i);
} else
val = NULL;
} else if (i < Nod-1) { } else if (i < Nod-1) {
strcpy(g->Message, "Unexpected array"); strcpy(g->Message, "Unexpected array");
...@@ -1289,16 +1287,12 @@ PJSON JSONCOL::GetRow(PGLOBAL g) ...@@ -1289,16 +1287,12 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
break; break;
case TYPE_JAR: case TYPE_JAR:
if (!Nodes[i].Key) { if (!Nodes[i].Key) {
if (Nodes[i].Op != OP_NULL) { arp = (PJAR)row;
arp = (PJAR)row;
if (Nodes[i].Rank)
val = arp->GetValue(Nodes[i].Rank - 1);
else
val = arp->GetValue(Nodes[i].Rx);
} else if (Nodes[i].Op == OP_EQ)
val = NULL; val = arp->GetValue(Nodes[i].Rank);
else
val = arp->GetValue(Nodes[i].Rx);
} else { } else {
strcpy(g->Message, "Unexpected array"); strcpy(g->Message, "Unexpected array");
...@@ -1390,8 +1384,8 @@ void JSONCOL::WriteColumn(PGLOBAL g) ...@@ -1390,8 +1384,8 @@ void JSONCOL::WriteColumn(PGLOBAL g)
} // endif jsp } // endif jsp
if (arp) { if (arp) {
if (Nod > 1 && Nodes[Nod-2].Rank) if (Nod > 1 && Nodes[Nod-2].Op == OP_EQ)
arp->SetValue(g, new(g) JVALUE(jsp), Nodes[Nod-2].Rank-1); arp->SetValue(g, new(g) JVALUE(jsp), Nodes[Nod-2].Rank);
else else
arp->AddValue(g, new(g) JVALUE(jsp)); arp->AddValue(g, new(g) JVALUE(jsp));
...@@ -1411,8 +1405,8 @@ void JSONCOL::WriteColumn(PGLOBAL g) ...@@ -1411,8 +1405,8 @@ void JSONCOL::WriteColumn(PGLOBAL g)
case TYPE_INT: case TYPE_INT:
case TYPE_DOUBLE: case TYPE_DOUBLE:
if (arp) { if (arp) {
if (Nodes[Nod-1].Rank) if (Nodes[Nod-1].Op == OP_EQ)
arp->SetValue(g, new(g) JVALUE(g, Value), Nodes[Nod-1].Rank-1); arp->SetValue(g, new(g) JVALUE(g, Value), Nodes[Nod-1].Rank);
else else
arp->AddValue(g, new(g) JVALUE(g, Value)); arp->AddValue(g, new(g) JVALUE(g, Value));
...@@ -1562,7 +1556,7 @@ int TDBJSON::MakeDocument(PGLOBAL g) ...@@ -1562,7 +1556,7 @@ int TDBJSON::MakeDocument(PGLOBAL g)
arp = jsp->GetArray(); arp = jsp->GetArray();
objp = NULL; objp = NULL;
i = atoi(objpath+1) - 1; i = atoi(objpath+1) - B;
val = arp->GetValue(i); val = arp->GetValue(i);
if (!val) { if (!val) {
...@@ -1750,6 +1744,7 @@ int TDBJSON::ReadDB(PGLOBAL) ...@@ -1750,6 +1744,7 @@ int TDBJSON::ReadDB(PGLOBAL)
if (NextSame) { if (NextSame) {
SameRow = NextSame; SameRow = NextSame;
NextSame = false; NextSame = false;
M++;
rc = RC_OK; rc = RC_OK;
} else if (++Fpos < (signed)Doc->size()) { } else if (++Fpos < (signed)Doc->size()) {
Row = Doc->GetValue(Fpos); Row = Doc->GetValue(Fpos);
...@@ -1758,6 +1753,7 @@ int TDBJSON::ReadDB(PGLOBAL) ...@@ -1758,6 +1753,7 @@ int TDBJSON::ReadDB(PGLOBAL)
Row = ((PJVAL)Row)->GetJson(); Row = ((PJVAL)Row)->GetJson();
SameRow = 0; SameRow = 0;
M = 1;
rc = RC_OK; rc = RC_OK;
} else } else
rc = RC_EF; rc = RC_EF;
......
storage/connect/tabjson.h
View file @ a82171c9
...@@ -57,6 +57,7 @@ class JSONDEF : public DOSDEF { /* Table description */ ...@@ -57,6 +57,7 @@ class JSONDEF : public DOSDEF { /* Table description */
int Limit; /* Limit of multiple values */ int Limit; /* Limit of multiple values */
int Pretty; /* Depends on file structure */ int Pretty; /* Depends on file structure */
int Level; /* Used for catalog table */ int Level; /* Used for catalog table */
int Base; /* Tne array index base */
bool Strict; /* Strict syntax checking */ bool Strict; /* Strict syntax checking */
}; // end of JSONDEF }; // end of JSONDEF
...@@ -84,7 +85,7 @@ class TDBJSN : public TDBDOS { ...@@ -84,7 +85,7 @@ class TDBJSN : public TDBDOS {
virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n); virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n);
virtual PCOL InsertSpecialColumn(PCOL colp); virtual PCOL InsertSpecialColumn(PCOL colp);
virtual int RowNumber(PGLOBAL g, bool b = FALSE) virtual int RowNumber(PGLOBAL g, bool b = FALSE)
{return (b) ? N : Fpos + 1;} {return (b) ? M : N;}
// Database routines // Database routines
virtual int Cardinality(PGLOBAL g); virtual int Cardinality(PGLOBAL g);
...@@ -106,13 +107,14 @@ class TDBJSN : public TDBDOS { ...@@ -106,13 +107,14 @@ class TDBJSN : public TDBDOS {
char *Objname; // The table object name char *Objname; // The table object name
char *Xcol; // Name of expandable column char *Xcol; // Name of expandable column
int Fpos; // The current row index int Fpos; // The current row index
//int Spos; // DELETE start index
int N; // The current Rownum int N; // The current Rownum
int M; // Index of multiple value
int Limit; // Limit of multiple values int Limit; // Limit of multiple values
int Pretty; // Depends on file structure int Pretty; // Depends on file structure
int NextSame; // Same next row int NextSame; // Same next row
int SameRow; // Same row nb int SameRow; // Same row nb
int Xval; // Index of expandable array int Xval; // Index of expandable array
int B; // Array index base
bool Strict; // Strict syntax checking bool Strict; // Strict syntax checking
bool Comma; // Row has final comma bool Comma; // Row has final comma
}; // end of class TDBJSN }; // end of class TDBJSN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7