database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Add the new BSON temporary type for testing

Browse Source 
modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/bson.cpp
  modified:   storage/connect/bson.h
  modified:   storage/connect/bsonudf.cpp
  modified:   storage/connect/bsonudf.h
  modified:   storage/connect/global.h
  modified:   storage/connect/json.cpp
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/disabled.def
  modified:   storage/connect/mysql-test/connect/t/mongo_test.inc
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/tabbson.cpp
  modified:   storage/connect/tabjson.cpp
This commit is contained in:
Olivier Bertrand
2021-01-08 22:18:52 +01:00
parent cba46c9912
commit 8f34d45404
21 changed files with 4227 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
storage/connect/tabjson.cpp
View File

@@ -310,7 +310,8 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
case RC_FX:
goto err;
default:
jsp = tjnp->FindRow(g);
// jsp = tjnp->FindRow(g); // FindRow was done in ReadDB
jsp = tjnp->Row;
} // endswitch ReadDB
} // endif pretty
@@ -360,7 +361,8 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
case RC_FX:
goto err;
default:
jsp = tjnp->FindRow(g);
// jsp = tjnp->FindRow(g);
jsp = tjnp->Row;
} // endswitch ReadDB
} else
@@ -397,26 +399,26 @@ bool JSONDISC::Find(PGLOBAL g, PJVAL jvp, PCSZ key, int j)
jcol.Type = jvp->DataType;
switch (jvp->DataType) {
case TYPE_STRG:
case TYPE_DTM:
jcol.Len = (int)strlen(jvp->Strp);
break;
case TYPE_INTG:
case TYPE_BINT:
jcol.Len = (int)strlen(jvp->GetString(g));
break;
case TYPE_DBL:
jcol.Len = (int)strlen(jvp->GetString(g));
jcol.Scale = jvp->Nd;
break;
case TYPE_BOOL:
jcol.Len = 1;
break;
default:
jcol.Len = 0;
break;
} // endswitch Type
switch (jvp->DataType) {
case TYPE_STRG:
case TYPE_DTM:
jcol.Len = (int)strlen(jvp->Strp);
break;
case TYPE_INTG:
case TYPE_BINT:
jcol.Len = (int)strlen(jvp->GetString(g));
break;
case TYPE_DBL:
jcol.Len = (int)strlen(jvp->GetString(g));
jcol.Scale = jvp->Nd;
break;
case TYPE_BOOL:
jcol.Len = 1;
break;
default:
jcol.Len = 0;
break;
} // endswitch Type
jcol.Scale = jvp->Nd;
jcol.Cbn = jvp->DataType == TYPE_NULL;