Skip to content

Commit accac77

Browse files
stamparmstamparm
committed
some fixes
1 parent 7e560ee commit accac77

4 files changed

Lines changed: 47 additions & 13 deletions

File tree

‎plugins/dbms/mssqlserver/connector.py‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,27 @@ def fetchall(self):
5656
return None
5757

5858
def execute(self, query):
59+
retVal = False
60+
5961
try:
6062
self.cursor.execute(utf8encode(query))
63+
retVal = True
6164
except (pymssql.OperationalError, pymssql.ProgrammingError), msg:
6265
logger.warn(msg)
6366
except pymssql.InternalError, msg:
6467
raise sqlmapConnectionException, msg
6568

69+
return retVal
70+
6671
def select(self, query):
67-
self.execute(query)
68-
value = self.fetchall()
72+
retVal = None
6973

70-
try:
71-
self.connector.commit()
72-
except pymssql.OperationalError:
73-
pass
74+
if self.execute(query):
75+
retVal = self.fetchall()
76+
77+
try:
78+
self.connector.commit()
79+
except pymssql.OperationalError:
80+
pass
7481

75-
return value
82+
return retVal

‎plugins/dbms/mysql/connector.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,24 @@ def fetchall(self):
5151
return None
5252

5353
def execute(self, query):
54+
retVal = False
55+
5456
try:
5557
self.cursor.execute(query)
58+
retVal = True
5659
except (pymysql.OperationalError, pymysql.ProgrammingError), msg:
5760
logger.warn(msg[1])
5861
except pymysql.InternalError, msg:
5962
raise sqlmapConnectionException, msg[1]
6063

6164
self.connector.commit()
6265

66+
return retVal
67+
6368
def select(self, query):
64-
self.execute(query)
65-
return self.fetchall()
69+
retVal = None
70+
71+
if self.execute(query):
72+
retVal = self.fetchall()
73+
74+
return retVal

‎plugins/dbms/oracle/connector.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,24 @@ def fetchall(self):
6060
return None
6161

6262
def execute(self, query):
63+
retVal = False
64+
6365
try:
6466
self.cursor.execute(utf8encode(query))
67+
retVal = True
6568
except (cx_Oracle.DatabaseError), msg:
6669
logger.warn(msg)
6770
except cx_Oracle.InternalError, msg:
6871
raise sqlmapConnectionException, msg
6972

7073
self.connector.commit()
7174

75+
return retVal
76+
7277
def select(self, query):
73-
self.execute(query)
74-
return self.fetchall()
78+
retVal = None
79+
80+
if self.execute(query):
81+
retVal = self.fetchall()
82+
83+
return retVal

‎plugins/dbms/postgresql/connector.py‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,24 @@ def fetchall(self):
5555
return None
5656

5757
def execute(self, query):
58+
retVal = False
59+
5860
try:
5961
self.cursor.execute(query)
62+
retVal = True
6063
except (psycopg2.OperationalError, psycopg2.ProgrammingError), msg:
6164
logger.warn(msg)
6265
except psycopg2.InternalError, msg:
6366
raise sqlmapConnectionException, msg
6467

6568
self.connector.commit()
6669

70+
return retVal
71+
6772
def select(self, query):
68-
self.execute(query)
69-
return self.fetchall()
73+
retVal = None
74+
75+
if self.execute(query):
76+
retVal = self.fetchall()
77+
78+
return retVal

0 commit comments

Comments
 (0)