sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-06 00:03:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make CursorAdapter more generic (directly use AbstractConnection)

Browse Source
This commit is contained in:
Sandro Santilli 2019-12-17 14:43:35 +01:00
parent 95cb05e12e
commit ae8f35926f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/plugins/db_manager/db_plugins/postgis/connector.py
View File

@ -73,14 +73,11 @@ class CursorAdapter():
self._execute() self._execute()
def _toStrResultSet(self, res): def _toStrResultSet(self, res):
#print("XXX type of QVariant(None) is " + str(type(QVariant(None))))
newres = [] newres = []
for rec in res: for rec in res:
newrec = [] newrec = []
for col in rec: for col in rec:
#print("XXX col of rec of resultset valued " + str(col)+ " is typed " + str(type(col)))
if type(col) == type(QVariant(None)): if type(col) == type(QVariant(None)):
#print("XXX qvariant type of " + str(col)+ " is " + str(col.type))
if (str(col) == 'NULL'): if (str(col) == 'NULL'):
col = None col = None
else: else:
@ -97,7 +94,7 @@ class CursorAdapter():
if (self.sql == None): if (self.sql == None):
return return
self._debug("execute called with sql " + self.sql) self._debug("execute called with sql " + self.sql)
self.result = self._toStrResultSet(self.connection._executeSql(self.sql)) self.result = self._toStrResultSet(self.connection.executeSql(self.sql))
self._debug("execute returned " + str(len(self.result)) + " rows") self._debug("execute returned " + str(len(self.result)) + " rows")
self.cursor = 0 self.cursor = 0
self.description = [] self.description = []
@ -1121,7 +1118,7 @@ class PostGisDBConnector(DBConnector):
if cursor != None: if cursor != None:
cursor._execute(sql) cursor._execute(sql)
return cursor return cursor
return CursorAdapter(self, sql) return CursorAdapter(self.core_connection, sql)
def _executeSql(self, sql): def _executeSql(self, sql):
return self.core_connection.executeSql(sql) return self.core_connection.executeSql(sql)
@ -1129,7 +1126,7 @@ class PostGisDBConnector(DBConnector):
def _get_cursor(self, name=None): def _get_cursor(self, name=None):
#if name is not None: #if name is not None:
# print("XXX _get_cursor called with a Name: " + name) # print("XXX _get_cursor called with a Name: " + name)
return CursorAdapter(self, name) return CursorAdapter(self.core_connection, name)
def _commit(self): def _commit(self):
pass pass