projects
/
osm
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding GitLab Scanner
[osm/common.git]
/
osm_common
/
dbmongo.py
diff --git
a/osm_common/dbmongo.py
b/osm_common/dbmongo.py
index
b0686aa
..
7fc29dc
100644
(file)
--- a/
osm_common/dbmongo.py
+++ b/
osm_common/dbmongo.py
@@
-99,9
+99,9
@@
class DbMongo(DbBase):
self.database_key = master_key
self.set_secret_key(master_key)
if config.get("uri"):
self.database_key = master_key
self.set_secret_key(master_key)
if config.get("uri"):
- self.client = MongoClient(config["uri"])
+ self.client = MongoClient(config["uri"]
, replicaSet=config.get("replicaset", None)
)
else:
else:
- self.client = MongoClient(config["host"], config["port"])
+ self.client = MongoClient(config["host"], config["port"]
, replicaSet=config.get("replicaset", None)
)
# TODO add as parameters also username=config.get("user"), password=config.get("password"))
# when all modules are ready
self.db = self.client[config["name"]]
# TODO add as parameters also username=config.get("user"), password=config.get("password"))
# when all modules are ready
self.db = self.client[config["name"]]
@@
-363,13
+363,13
@@
class DbMongo(DbBase):
raise DbException(e)
def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None,
raise DbException(e)
def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None,
- push_list=None, pull_list=None):
+ push_list=None, pull_list=None
, upsert=False
):
"""
Modifies an entry at database
:param table: collection or table
:param q_filter: Filter
:param update_dict: Plain dictionary with the content to be updated. It is a dot separated keys and a value
"""
Modifies an entry at database
:param table: collection or table
:param q_filter: Filter
:param update_dict: Plain dictionary with the content to be updated. It is a dot separated keys and a value
- :param fail_on_empty: If nothing matches filter it returns None unless this flag is set t
u
True, in which case
+ :param fail_on_empty: If nothing matches filter it returns None unless this flag is set t
o
True, in which case
it raises a DbException
:param unset: Plain dictionary with the content to be removed if exist. It is a dot separated keys, value is
ignored. If not exist, it is ignored
it raises a DbException
:param unset: Plain dictionary with the content to be removed if exist. It is a dot separated keys, value is
ignored. If not exist, it is ignored
@@
-380,6
+380,8
@@
class DbMongo(DbBase):
is appended to the end of the array
:param push_list: Same as push but values are arrays where each item is and appended instead of appending the
whole array
is appended to the end of the array
:param push_list: Same as push but values are arrays where each item is and appended instead of appending the
whole array
+ :param upsert: If this parameter is set to True and no document is found using 'q_filter' it will be created.
+ By default this is false.
:return: Dict with the number of entries modified. None if no matching is found.
"""
try:
:return: Dict with the number of entries modified. None if no matching is found.
"""
try:
@@
-399,7
+401,7
@@
class DbMongo(DbBase):
with self.lock:
collection = self.db[table]
with self.lock:
collection = self.db[table]
- rows = collection.update_one(self._format_filter(q_filter), db_oper)
+ rows = collection.update_one(self._format_filter(q_filter), db_oper
, upsert=upsert
)
if rows.matched_count == 0:
if fail_on_empty:
raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),
if rows.matched_count == 0:
if fail_on_empty:
raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),