summaryrefslogtreecommitdiff
path: root/storage/connect/tabjson.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2021-05-05 00:31:21 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2021-05-05 00:31:21 +0200
commit5ae67c6d6387fa6e5c207fd9aea6741fb78073a5 (patch)
tree19eb0904944a35e6869030d004e6aa85e5313f6d /storage/connect/tabjson.cpp
parent3b5dabeb96167c35df66475c5cb9be083065e941 (diff)
downloadmariadb-git-5ae67c6d6387fa6e5c207fd9aea6741fb78073a5.tar.gz
- All this concern Json or Mongo tables based on MongoDB collections.
- Limit decimals of doubles printed from MongoDB Done in function Mini for Mongo C Driver and Java Driver Done in function SerializeValue for Java tables using the J Driver modified: storage/connect/cmgoconn.cpp modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/tabjmg.cpp - Fix crash when using BSON_TYPE_DECIMAL128 modified: storage/connect/cmgoconn.cpp - Collection name default to table name Fix it when creating tables via discovery modified: storage/connect/ha_connect.cc modified: storage/connect/tabbson.cpp modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/tabjson.cpp')
-rw-r--r--storage/connect/tabjson.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp
index dfcf3ee2d4f..4a8031113d2 100644
--- a/storage/connect/tabjson.cpp
+++ b/storage/connect/tabjson.cpp
@@ -222,8 +222,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt)
if (tdp->Uri) {
#if defined(JAVA_SUPPORT) || defined(CMGO_SUPPORT)
- tdp->Collname = GetStringTableOption(g, topt, "Name", NULL);
- tdp->Collname = GetStringTableOption(g, topt, "Tabname", tdp->Collname);
+ tdp->Collname = GetStringTableOption(g, topt, "Tabname", NULL);
tdp->Schema = GetStringTableOption(g, topt, "Dbname", "test");
tdp->Options = (PSZ)GetStringTableOption(g, topt, "Colist", "all");
tdp->Pipe = GetBooleanTableOption(g, topt, "Pipeline", false);