Skip to content

erp5
erp5
Commit c06cbf38 authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files
Options

py3: Update Shared.DC.ZRDB.{sqltest,sqlvar} monkey patches. 

This supports both python2 and python3. For python3, this decode() properly
arguments returned by string_literal() to have str(), otherwise the query string
is an str() (DocumentTemplate) and the arguments are bytes().

In other places, bytes() is used directly but in this case this is not needed
and would require monkey patching (at least) DocumentTemplate.
parent 2e1359b0
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 115 deletions
product/ERP5Type/patches/sqltest.py
View file @ c06cbf38
......@@ -13,57 +13,64 @@
from Shared.DC.ZRDB.sqltest import *
from Shared.DC.ZRDB import sqltest
from DateTime import DateTime
from types import StringType
list_type_list = list, tuple, set, frozenset, dict
if 1: # For easy diff with original
if 1: # For easy diff with original (ZSQLMethods 3.14)
def render(self, md):
name=self.__name__
name = self.__name__
t=self.type
args=self.args
t = self.type
args = self.args
try:
expr=self.expr
if type(expr) is type(''):
v=md[expr]
expr = self.expr
if isinstance(expr, StringTypes):
v = md[expr]
else:
v=expr(md)
v = expr(md)
except (KeyError, NameError):
if args.has_key('optional') and args['optional']:
if 'optional' in args and args['optional']:
return ''
raise ValueError('Missing input variable, <em>%s</em>' % name)
# PATCH: use isinstance instead of type comparison, to allow
# subclassing.
if isinstance(v, list_type_list):
if len(v) > 1 and not self.multiple:
raise ValueError(
'multiple values are not allowed for <em>%s</em>'
% name)
else: v=[v]
msg = 'multiple values are not allowed for <em>%s</em>' % name
raise ValueError(msg)
else:
v = [v]
vs=[]
vs = []
for v in v:
if not v and type(v) is StringType and t != 'string': continue
if t=='int':
if not v and isinstance(v, StringTypes) and t != 'string':
continue
if t == 'int':
try:
if type(v) is StringType:
if v[-1:]=='L':
v=v[:-1]
if isinstance(v, StringTypes):
if six.PY3 and isinstance(v, bytes):
v = v.decode(self.encoding or 'UTF-8')
if v[-1:] == 'L':
v = v[:-1]
int(v)
else: v=str(int(v))
except ValueError:
raise ValueError(
'Invalid integer value for <em>%s</em>' % name)
elif t=='float':
if not v and type(v) is StringType: continue
else:
v = str(int(v))
except (TypeError, ValueError):
msg = 'Invalid integer value for <em>%s</em>' % name
raise ValueError(msg)
elif t == 'float':
if not v and isinstance(v, StringTypes):
continue
try:
if type(v) is StringType: float(v)
else: v=str(float(v))
except ValueError:
raise ValueError(
'Invalid floating-point value for <em>%s</em>' % name)
if six.PY3 and isinstance(v, bytes):
v = v.decode(self.encoding or 'UTF-8')
if isinstance(v, StringTypes):
float(v)
else:
v = str(float(v))
except (TypeError, ValueError):
msg = 'Invalid floating-point value for <em>%s</em>' % name
raise ValueError(msg)
elif t.startswith('datetime'):
# For subsecond precision, use 'datetime(N)' MySQL type,
# where N is the number of digits after the decimal point.
......@@ -73,38 +80,45 @@ if 1: # For easy diff with original
('.%06u' % (v.micros() % 1000000))[:1+n] if n else '')
else:
if not isinstance(v, (str, unicode)):
if not isinstance(v, StringTypes):
v = str(v)
v=md.getitem('sql_quote__',0)(v)
#if find(v,"\'") >= 0: v=join(split(v,"\'"),"''")
#v="'%s'" % v
if isinstance(v, six.binary_type):
v = v.decode('utf-8')
# The call to sql_quote__ can return something that is not
# a native string anymore!
v = md.getitem('sql_quote__', 0)(v)
if isinstance(v, six.binary_type):
v = v.decode('utf-8')
# if v.find("\'") >= 0: v="''".(v.split("\'"))
# v="'%s'" % v
vs.append(v)
if not vs and t=='nb':
if args.has_key('optional') and args['optional']:
if not vs and t == 'nb':
if 'optional' in args and args['optional']:
return ''
else:
raise ValueError(
'Invalid empty string value for <em>%s</em>' % name)
err = 'Invalid empty string value for <em>%s</em>' % name
raise ValueError(err)
if not vs:
if self.optional: return ''
raise ValueError(
'No input was provided for <em>%s</em>' % name)
if self.optional:
return ''
raise ValueError('No input was provided for <em>%s</em>' % name)
if len(vs) > 1:
vs = ', '.join(map(str, vs))
if self.op == '<>':
## Do the equivalent of 'not-equal' for a list,
## "a not in (b,c)"
return "%s not in (%s)" % (self.column, vs)
# Do the equivalent of 'not-equal' for a list,
# "a not in (b,c)"
return '%s not in (%s)' % (self.column, vs)
else:
## "a in (b,c)"
return "%s in (%s)" % (self.column, vs)
return "%s %s %s" % (self.column, self.op, vs[0])
# "a in (b,c)"
return '%s in (%s)' % (self.column, vs)
return '%s %s %s' % (self.column, self.op, vs[0])
SQLTest.render = SQLTest.__call__ = render
new_valid_types = (('int', 'float', 'string', 'nb', 'datetime') + tuple('datetime(%s)' % x for x in xrange(7)))
from builtins import range
new_valid_types = (('int', 'float', 'string', 'nb', 'datetime') + tuple('datetime(%s)' % x for x in range(7)))
try:
# BBB
......
product/ERP5Type/patches/sqlvar.py
View file @ c06cbf38
......@@ -14,50 +14,60 @@
# dtml-sqlvar patch to convert None to NULL, and deal with DateTime
from Shared.DC.ZRDB.sqlvar import SQLVar
from Shared.DC.ZRDB.sqlvar import *
from Shared.DC.ZRDB import sqlvar
from string import atoi,atof
from DateTime import DateTime
def SQLVar_render(self, md):
args=self.args
t=args['type']
if 1: # For easy diff with original (ZSQLMethods 3.14)
def render(self, md):
name = self.__name__
args = self.args
t = args['type']
try:
expr=self.expr
if type(expr) is str: v=md[expr]
else: v=expr(md)
expr = self.expr
if isinstance(expr, StringTypes):
v = md[expr]
else:
v = expr(md)
except Exception:
if args.get('optional'):
if 'optional' in args and args['optional']:
return 'null'
if type(expr) is not str:
if not isinstance(expr, StringTypes):
raise
raise ValueError('Missing input variable, <em>%s</em>' % self.__name__)
raise ValueError('Missing input variable, <em>%s</em>' % name)
if v is None and args.get('optional'):
if v is None:
return 'null'
if t=='int':
if t == 'int':
try:
if type(v) is str:
if v[-1:]=='L':
v=v[:-1]
atoi(v)
return v
return str(int(v))
if isinstance(v, StringTypes):
if v[-1:] == 'L':
v = v[:-1]
int(v)
else:
v = str(int(v))
except Exception:
t = 'integer'
elif t=='float':
if not v and 'optional' in args and args['optional']:
return 'null'
err = 'Invalid integer value for <em>%s</em>' % name
raise ValueError(err)
elif t == 'float':
try:
if type(v) is str:
if v[-1:]=='L':
v=v[:-1]
atof(v)
return v
# ERP5 patch, we use repr that have better precision than str for
# floats
return repr(float(v))
if isinstance(v, StringTypes):
if v[-1:] == 'L':
v = v[:-1]
float(v)
else:
# ERP5 patch: We use repr that have better precision than str for
# floats (on python2 only)
v = repr(float(v))
except Exception:
t = 'floating-point'
if not v and 'optional' in args and args['optional']:
return 'null'
err = 'Invalid floating-point value for <em>%s</em>' % name
raise ValueError(err)
elif t.startswith('datetime'):
# For subsecond precision, use 'datetime(N)' MySQL type,
# where N is the number of digits after the decimal point.
......@@ -68,23 +78,29 @@ def SQLVar_render(self, md):
('.%06u' % (v.micros() % 1000000))[:1+n] if n else '')
except Exception:
t = 'datetime'
elif t=='nb' and not v:
t = 'empty string'
else:
v = md.getitem('sql_quote__',0)(
v if isinstance(v, basestring) else str(v))
#if find(v,"\'") >= 0: v=join(split(v,"\'"),"''")
#v="'%s'" % v
return v
if args.get('optional'):
else:
if not isinstance(v, (str, StringTypes)):
v = str(v)
if not v and t == 'nb':
if 'optional' in args and args['optional']:
return 'null'
raise ValueError('Invalid %s value for <em>%s</em>: %r'
% (t, self.__name__, v))
else:
err = 'Invalid empty string value for <em>%s</em>' % name
raise ValueError(err)
v = md.getitem('sql_quote__', 0)(v)
# if v.find("\'") >= 0: v="''".join(v.split("\'"))
# v="'%s'" % v
return v
# Patched by yo. datetime is added.
new_valid_types = 'int', 'float', 'string', 'nb', 'datetime'
new_valid_types += tuple(map('datetime(%s)'.__mod__, xrange(7)))
new_valid_types += tuple(map('datetime(%s)'.__mod__, range(7)))
try:
# BBB
from Shared.DC.ZRDB.sqlvar import valid_type
......@@ -92,6 +108,5 @@ try:
except ImportError:
sqlvar.valid_types = new_valid_types
SQLVar.render = SQLVar_render
SQLVar.__call__ = SQLVar_render
SQLVar.render = render
SQLVar.__call__ = render
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7