diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2020-02-03 15:45:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 15:45:34 +0000 |
| commit | 2a4031532e1455dac21187184a87c4541b5ebadb (patch) | |
| tree | 59ffd52e476fcd887c59f1744810a8abf0da652e | |
| parent | 0619ec7b19f07d3adda1dac9988881a50077e832 (diff) | |
| parent | a19b9ff23ddb7da217954f963009d38c630891a7 (diff) | |
| download | couchdb-2a4031532e1455dac21187184a87c4541b5ebadb.tar.gz | |
Merge branch 'master' into fauxton_1.2.3
| -rw-r--r-- | src/mango/src/mango_cursor.erl | 2 | ||||
| -rw-r--r-- | src/mango/test/05-index-selection-test.py | 8 | ||||
| -rw-r--r-- | src/mango/test/12-use-correct-index-test.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mango/src/mango_cursor.erl b/src/mango/src/mango_cursor.erl index 29be49490..b1cb4148e 100644 --- a/src/mango/src/mango_cursor.erl +++ b/src/mango/src/mango_cursor.erl @@ -133,7 +133,7 @@ maybe_add_warning(UserFun, #cursor{index = Index, opts = Opts}, Stats, UserAcc) [] -> UserAcc; _ -> - WarningStr = lists:join(<<"\n">>, Warnings), + WarningStr = iolist_to_binary(lists:join(<<"\n">>, Warnings)), Arg = {add_key, warning, WarningStr}, {_Go, UserAcc1} = UserFun(Arg, UserAcc), UserAcc1 diff --git a/src/mango/test/05-index-selection-test.py b/src/mango/test/05-index-selection-test.py index 271e36176..2bc5a88f0 100644 --- a/src/mango/test/05-index-selection-test.py +++ b/src/mango/test/05-index-selection-test.py @@ -84,7 +84,7 @@ class IndexSelectionTests: ddocid = "_design/age" r = self.db.find({}, use_index=ddocid, return_raw=True) self.assertEqual( - r["warning"][0].lower(), + r["warning"].split('\n')[0].lower(), "{0} was not used because it does not contain a valid index for this query.".format( ddocid ), @@ -107,7 +107,7 @@ class IndexSelectionTests: selector = {"company": "Pharmex"} r = self.db.find(selector, use_index=ddocid, return_raw=True) self.assertEqual( - r["warning"][0].lower(), + r["warning"].split('\n')[0].lower(), "{0} was not used because it does not contain a valid index for this query.".format( ddocid ), @@ -124,7 +124,7 @@ class IndexSelectionTests: resp = self.db.find(selector, use_index=[ddocid, name], return_raw=True) self.assertEqual( - resp["warning"][0].lower(), + resp["warning"].split('\n')[0].lower(), "{0}, {1} was not used because it is not a valid index for this query.".format( ddocid, name ), @@ -162,7 +162,7 @@ class IndexSelectionTests: selector, sort=["foo", "bar"], use_index=ddocid_invalid, return_raw=True ) self.assertEqual( - resp["warning"][0].lower(), + resp["warning"].split('\n')[0].lower(), "{0} was not used because it does not contain a valid index for this query.".format( ddocid_invalid ), diff --git a/src/mango/test/12-use-correct-index-test.py b/src/mango/test/12-use-correct-index-test.py index 3a2f60af8..b6fe434f8 100644 --- a/src/mango/test/12-use-correct-index-test.py +++ b/src/mango/test/12-use-correct-index-test.py @@ -93,7 +93,7 @@ class ChooseCorrectIndexForDocs(mango.DbPerClass): self.assertEqual(explain_resp["index"]["type"], "special") resp = self.db.find(selector, return_raw=True) self.assertEqual( - resp["warning"][0].lower(), + resp["warning"].split('\n')[0].lower(), "no matching index found, create an index to optimize query time.", ) |