diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
| commit | 0697d75cd052e809b05cc3e812f5e48209c04b4c (patch) | |
| tree | 16524035d92e3d78dc27db00dbc30198aa84db78 /storage/connect/mongo.cpp | |
| parent | f6549e95448e5cce52336361f5a59d1edcdac46a (diff) | |
| parent | c05e571e7d53ba11a3422490cff0d93e6691ea62 (diff) | |
| download | mariadb-git-10.5-merge.tar.gz | |
Merge commit 'c05e571e7d53ba11a3422490cff0d93e6691ea62' into HEAD10.5-merge
Diffstat (limited to 'storage/connect/mongo.cpp')
| -rw-r--r-- | storage/connect/mongo.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/storage/connect/mongo.cpp b/storage/connect/mongo.cpp index bd3d3b893c1..5f10a89ee67 100644 --- a/storage/connect/mongo.cpp +++ b/storage/connect/mongo.cpp @@ -35,6 +35,7 @@ bool MakeSelector(PGLOBAL g, PFIL fp, PSTRG s); bool IsNum(PSZ s); +int GetDefaultDepth(void); /***********************************************************************/ /* Make selector json representation for Mongo tables. */ @@ -248,15 +249,10 @@ MGODISC::MGODISC(PGLOBAL g, int *lg) { /***********************************************************************/ int MGODISC::GetColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt) { - PCSZ level = GetStringTableOption(g, topt, "Level", NULL); PMGODEF tdp; - if (level) { - lvl = atoi(level); - lvl = (lvl > 16) ? 16 : lvl; - } else - lvl = 0; - + lvl = GetIntegerTableOption(g, topt, "Level", GetDefaultDepth()); + lvl = GetIntegerTableOption(g, topt, "Depth", lvl); all = GetBooleanTableOption(g, topt, "Fullarray", false); /*********************************************************************/ |