github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

.

pull/32/head
Apex Liu 2017-06-01 18:40:34 +08:00
parent 1920375478
commit 7881d0f1ee
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/www/teleport/app/eom_app/app/db.py
View File

@ -489,15 +489,12 @@ class TPMysqlPool(TPDatabasePool):
def _do_transaction(self, conn, sql_list): def _do_transaction(self, conn, sql_list):
cursor = conn.cursor() cursor = conn.cursor()
try: try:
# cursor.execute('BEGIN;')
conn.begin() conn.begin()
for sql in sql_list: for sql in sql_list:
cursor.execute(sql) cursor.execute(sql)
# cursor.execute('COMMIT;')
conn.commit() conn.commit()
return True return True
except Exception as e: except Exception as e:
# cursor.execute('ROLLBACK;')
conn.rollback() conn.rollback()
log.e('[mysql] _do_transaction() failed: {}\n'.format(e.__str__())) log.e('[mysql] _do_transaction() failed: {}\n'.format(e.__str__()))
return False return False
@ -512,7 +509,7 @@ class TPMysqlPool(TPDatabasePool):
conn.commit() conn.commit()
return db_ret[0][0] return db_ret[0][0]
except Exception as e: except Exception as e:
log.e('[sqlite] _last_insert_id() failed: {}\n'.format(e.__str__())) log.e('[mysql] _last_insert_id() failed: {}\n'.format(e.__str__()))
return -1 return -1
finally: finally:
cursor.close() cursor.close()