改进mongo工具类更新操作

zhanghe06 · zhanghe06 · commit a364e4413c78 · 2015-11-27T13:22:55.000+08:00
diff --git a/test/test_mongo.py b/test/test_mongo.py
@@ -44,13 +44,16 @@
 
 def test():
     try:
+        table_name = 'user'
         conn = Mongodb(db_config)
         print conn.db
-        print conn.find_one('user')
-        print conn.remove('user')
-        print conn.insert('user', test_date)
-        print conn.update('user', {'id': 1}, {'$set': {'age': 28}})
-        conn.output_rows('user')
+        print conn.find_one(table_name)
+        print conn.remove(table_name)  # &#28165;&#31354;&#35760;&#24405;
+        print conn.insert(table_name, test_date)  # &#25554;&#20837;&#35760;&#24405;
+        print conn.update(table_name, {'id': 3}, {'age': 24})  # id=3&#30340;&#35760;&#24405;&#24180;&#40836;&#26356;&#26032;&#20026;24
+        conn.output_rows(table_name)
+        print conn.update(table_name, {}, {'age': 1}, 'inc')  # &#25152;&#26377;&#35760;&#24405;&#24180;&#40836;&#22686;&#21152;1&#23681;
+        conn.output_rows(table_name)
     except Exception, e:
         print e
 
@@ -62,7 +65,9 @@ def test():
 """
 Database(MongoClient(host=['localhost:27017'], document_class=dict, tz_aware=False, connect=True), u'test_user')
 None
+0
 [1, 2, 3]
+1
 **********  &#34920;&#21517;[user]  [1/3]  **********
 city : shanghai
 name : Lily
@@ -81,7 +86,30 @@ def test():
 city : beijing
 name : Jerry
  sex : M
- age : 22
+ age : 24
+  id : 3
+ _id : 3
+3
+**********  &#34920;&#21517;[user]  [1/3]  **********
+city : shanghai
+name : Lily
+ sex : F
+ age : 21
+  id : 1
+ _id : 1
+**********  &#34920;&#21517;[user]  [2/3]  **********
+city : shanghai
+name : Tom
+ sex : M
+ age : 23
+  id : 2
+ _id : 2
+**********  &#34920;&#21517;[user]  [3/3]  **********
+city : beijing
+name : Jerry
+ sex : M
+ age : 25
   id : 3
  _id : 3
+
 """
diff --git a/tools/mongo.py b/tools/mongo.py
@@ -109,17 +109,21 @@ def insert(self, table_name, data):
             logger.error('&#25554;&#20837;&#38169;&#35823;&#65306;%s' % e)
             return None
 
-    def update(self, table_name, condition, update_data):
+    def update(self, table_name, condition, update_data, update_type='set'):
         """
         &#25209;&#37327;&#26356;&#26032;&#25968;&#25454;
         upsert : &#22914;&#26524;&#19981;&#23384;&#22312;update&#30340;&#35760;&#24405;&#65292;&#26159;&#21542;&#25554;&#20837;&#65307;true&#20026;&#25554;&#20837;&#65292;&#40664;&#35748;&#26159;false&#65292;&#19981;&#25554;&#20837;&#12290;
         :param table_name:
         :param condition:
         :param update_data:
+        :param update_type: &#33539;&#22260;&#65306;['inc', 'set', 'unset', 'push', 'pushAll', 'addToSet', 'pop', 'pull', 'pullAll', 'rename']
         :return:
         """
+        if update_type not in ['inc', 'set', 'unset', 'push', 'pushAll', 'addToSet', 'pop', 'pull', 'pullAll', 'rename']:
+            logger.error('&#26356;&#26032;&#31867;&#22411;&#38169;&#35823;&#65306;%s' % update_type)
+            return None
         try:
-            result = self.db.get_collection(table_name).update_many(condition, update_data)
+            result = self.db.get_collection(table_name).update_many(condition, {'$%s' % update_type: update_data})
             logger.info('&#21305;&#37197;&#25968;&#37327;&#65306;%s&#65307;&#26356;&#26032;&#25968;&#37327;&#65306;%s' % (result.matched_count, result.modified_count))
             return result.modified_count  # &#36820;&#22238;&#26356;&#26032;&#25968;&#37327;&#65292;&#20165;&#25903;&#25345;MongoDB 2.6&#21450;&#20197;&#19978;&#29256;&#26412;
         except Exception, e:
