haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1122 from haiwen/django-1.8-fix

Browse Source 
Replaces commit_unless_managed with atomic transaction
This commit is contained in:
xiez
2016-04-15 10:48:08 +08:00
parent aaa51ea460 d3eec6eac9
commit 3867c1416c
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
seahub/base/database_storage/database_storage.py
View File

@@ -166,21 +166,21 @@ class DatabaseStorage(Storage):
encoded = base64.b64encode(binary)
mtime = value_to_db_datetime(datetime.today())
cursor = connection.cursor()
with transaction.atomic(using='default'):
cursor = connection.cursor()
if self.exists(name):
query = 'UPDATE %(table)s SET %(data_column)s = %%s, ' + \
'%(size_column)s = %%s, %(mtime_column)s = %%s ' + \
'WHERE %(name_md5_column)s = %%s'
query %= self.__dict__
cursor.execute(query, [encoded, size, mtime, name])
else:
query = 'INSERT INTO %(table)s (%(name_column)s, ' + \
'%(name_md5_column)s, %(data_column)s, %(size_column)s, '+ \
'%(mtime_column)s) VALUES (%%s, %%s, %%s, %%s, %%s)'
query %= self.__dict__
cursor.execute(query, (name, name_md5, encoded, size, mtime))
if self.exists(name):
query = 'UPDATE %(table)s SET %(data_column)s = %%s, ' + \
'%(size_column)s = %%s, %(mtime_column)s = %%s ' + \
'WHERE %(name_md5_column)s = %%s'
query %= self.__dict__
cursor.execute(query, [encoded, size, mtime, name])
else:
query = 'INSERT INTO %(table)s (%(name_column)s, ' + \
'%(name_md5_column)s, %(data_column)s, %(size_column)s, '+ \
'%(mtime_column)s) VALUES (%%s, %%s, %%s, %%s, %%s)'
query %= self.__dict__
cursor.execute(query, (name, name_md5, encoded, size, mtime))
transaction.commit_unless_managed(using='default')
return name
def exists(self, name):