dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed https://github.com/web2py/web2py/pull/33, fetching Oracle Clobs, thanks dhx

Browse Source
This commit is contained in:
mdipierro
2012-09-24 12:39:28 -05:00
parent bcb6e477cf
commit e8a2b3b10f
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-24 11:59:51) stable Version 2.0.9 (2012-09-24 12:39:22) stable
gluon/dal.py
+22 -12
View File
@@ -1555,19 +1555,22 @@ class BaseAdapter(ConnectionPool):
return 'SELECT %s %s FROM %s%s%s;' % \ return 'SELECT %s %s FROM %s%s%s;' % \
(sql_s, sql_f, sql_t, sql_w, sql_o) (sql_s, sql_f, sql_t, sql_w, sql_o)
def _fetchall(self):
return self.cursor.fetchall()
def _select_aux(self,sql,fields,attributes): def _select_aux(self,sql,fields,attributes):
args_get = attributes.get args_get = attributes.get
cache = args_get('cache',None) cache = args_get('cache',None)
if not cache: if not cache:
self.execute(sql) self.execute(sql)
rows = self.cursor.fetchall() rows = self._fetchall()
else: else:
(cache_model, time_expire) = cache (cache_model, time_expire) = cache
key = self.uri + '/' + sql + '/rows' key = self.uri + '/' + sql + '/rows'
if len(key)>200: key = hashlib.md5(key).hexdigest() if len(key)>200: key = hashlib.md5(key).hexdigest()
def _select_aux2(): def _select_aux2():
self.execute(sql) self.execute(sql)
return self.cursor.fetchall() return self._fetchall()
rows = cache_model(key,_select_aux2,time_expire) rows = cache_model(key,_select_aux2,time_expire)
if isinstance(rows,tuple): if isinstance(rows,tuple):
rows = list(rows) rows = list(rows)
@@ -2859,14 +2862,21 @@ class OracleAdapter(BaseAdapter):
self.execute('SELECT %s.currval FROM dual;' % sequence_name) self.execute('SELECT %s.currval FROM dual;' % sequence_name)
return int(self.cursor.fetchone()[0]) return int(self.cursor.fetchone()[0])
def parse_value(self, value, field_type, blob_decode=True): #def parse_value(self, value, field_type, blob_decode=True):
if blob_decode and isinstance(value, cx_Oracle.LOB): # if blob_decode and isinstance(value, cx_Oracle.LOB):
try: # try:
value = value.read() # value = value.read()
except self.driver.ProgrammingError: # except self.driver.ProgrammingError:
# After a subsequent fetch the LOB value is not valid anymore # # After a subsequent fetch the LOB value is not valid anymore
pass # pass
return BaseAdapter.parse_value(self, value, field_type, blob_decode) # return BaseAdapter.parse_value(self, value, field_type, blob_decode)
def _fetchall(self):
if any(x[1]==cx_Oracle.CLOB for x in self.cursor.description):
return [tuple([(c.read() if type(c) == cx_Oracle.LOB else c) \
for c in r]) for r in self.cursor]
else:
return self.cursor.fetchall()
class MSSQLAdapter(BaseAdapter): class MSSQLAdapter(BaseAdapter):
drivers = ('pyodbc',) drivers = ('pyodbc',)
@@ -7176,12 +7186,12 @@ def index():
# reduce the column info down to just the field names # reduce the column info down to just the field names
fields = [f[0] for f in columns] fields = [f[0] for f in columns]
# will hold our finished resultset in a list # will hold our finished resultset in a list
data = adapter.cursor.fetchall() data = adapter._fetchall()
# convert the list for each row into a dictionary so it's # convert the list for each row into a dictionary so it's
# easier to work with. row['field_name'] rather than row[0] # easier to work with. row['field_name'] rather than row[0]
return [dict(zip(fields,row)) for row in data] return [dict(zip(fields,row)) for row in data]
try: try:
data = adapter.cursor.fetchall() data = adapter._fetchall()
except: except:
return None return None
if fields or colnames: if fields or colnames: