EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.BANCHO. .FIX. Fix recursive return statement

Browse Source
This commit is contained in:
Nyo 2016-09-23 17:15:14 +02:00
parent 712aecb602
commit 4b6e621a70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpers/databaseHelperNew.py
View File

@ -160,7 +160,6 @@ class db:
:param query: query to execute. You can bind parameters with %s :param query: query to execute. You can bind parameters with %s
:param params: parameters list. First element replaces first %s and so on :param params: parameters list. First element replaces first %s and so on
""" """
log.debug(query)
cursor = None cursor = None
worker = self.pool.getWorker() worker = self.pool.getWorker()
@ -168,11 +167,12 @@ class db:
# Create cursor, execute query and commit # Create cursor, execute query and commit
cursor = worker.connection.cursor(MySQLdb.cursors.DictCursor) cursor = worker.connection.cursor(MySQLdb.cursors.DictCursor)
cursor.execute(query, params) cursor.execute(query, params)
log.debug(query)
return cursor.lastrowid return cursor.lastrowid
except MySQLdb.OperationalError: except MySQLdb.OperationalError:
del worker del worker
worker = None worker = None
self.execute(query, params) return self.execute(query, params)
finally: finally:
# Close the cursor and release worker's lock # Close the cursor and release worker's lock
if cursor is not None: if cursor is not None:
@ -188,7 +188,6 @@ class db:
:param params: parameters list. First element replaces first %s and so on :param params: parameters list. First element replaces first %s and so on
:param all: fetch one or all values. Used internally. Use fetchAll if you want to fetch all values :param all: fetch one or all values. Used internally. Use fetchAll if you want to fetch all values
""" """
log.debug(query)
cursor = None cursor = None
worker = self.pool.getWorker() worker = self.pool.getWorker()
@ -196,6 +195,7 @@ class db:
# Create cursor, execute the query and fetch one/all result(s) # Create cursor, execute the query and fetch one/all result(s)
cursor = worker.connection.cursor(MySQLdb.cursors.DictCursor) cursor = worker.connection.cursor(MySQLdb.cursors.DictCursor)
cursor.execute(query, params) cursor.execute(query, params)
log.debug(query)
if all == True: if all == True:
return cursor.fetchall() return cursor.fetchall()
else: else:
@ -203,7 +203,7 @@ class db:
except MySQLdb.OperationalError: except MySQLdb.OperationalError:
del worker del worker
worker = None worker = None
self.fetch(query, params, all) return self.fetch(query, params, all)
finally: finally:
# Close the cursor and release worker's lock # Close the cursor and release worker's lock
if cursor is not None: if cursor is not None: