diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-08 22:18:52 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-08 22:18:52 +0100 |
| commit | 8f34d45404817a4fe63251ac2ab74da96b6849fa (patch) | |
| tree | 6fe27ab74b650a0fcc409fbfbc08218f921fc00c /storage/connect/tabjson.cpp | |
| parent | cba46c9912b2bcd062ecc6b53082ba5eb5109e41 (diff) | |
| download | mariadb-git-8f34d45404817a4fe63251ac2ab74da96b6849fa.tar.gz | |
- Add the new BSON temporary type for testing
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
Diffstat (limited to 'storage/connect/tabjson.cpp')
| -rw-r--r-- | storage/connect/tabjson.cpp | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index 4bddef1940e..0ef281f2aae 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -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; |