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

db._legacyid=True

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-05-02 16:41:56 -05:00
parent 58f070949c
commit f50907f109
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.7 (2012-05-02 16:08:31) dev Version 1.99.7 (2012-05-02 16:41:33) dev
gluon/dal.py
+34 -9
View File
@@ -533,6 +533,7 @@ class BaseAdapter(ConnectionPool):
'blob': 'BLOB', 'blob': 'BLOB',
'upload': 'CHAR(%(length)s)', 'upload': 'CHAR(%(length)s)',
'integer': 'INTEGER', 'integer': 'INTEGER',
'float':'DOUBLE',
'double': 'DOUBLE', 'double': 'DOUBLE',
'decimal': 'DOUBLE', 'decimal': 'DOUBLE',
'date': 'DATE', 'date': 'DATE',
@@ -860,6 +861,7 @@ class BaseAdapter(ConnectionPool):
elif sql_fields[key]['sql'] != sql_fields_old[key]['sql'] \ elif sql_fields[key]['sql'] != sql_fields_old[key]['sql'] \
and not isinstance(table[key].type, SQLCustomType) \ and not isinstance(table[key].type, SQLCustomType) \
and not table[key].type.startswith('reference')\ and not table[key].type.startswith('reference')\
and not table[key].type.startswith('double')\
and not table[key].type.startswith('id'): and not table[key].type.startswith('id'):
sql_fields_current[key] = sql_fields[key] sql_fields_current[key] = sql_fields[key]
t = tablename t = tablename
@@ -1445,10 +1447,15 @@ class BaseAdapter(ConnectionPool):
self.execute(query) self.execute(query)
def log_execute(self, *a, **b): def log_execute(self, *a, **b):
self.db._lastsql = a[0] command = a[0]
if self.db._legacyid:
if command.startswith('CREATE') or command.startswith('ALTER'):
command = command.replace('BIGINT','INT').replace('BIGSERIAL','SERIAL')
a = [command]+a[1:]
self.db._lastsql = command
t0 = time.time() t0 = time.time()
ret = self.cursor.execute(*a, **b) ret = self.cursor.execute(*a, **b)
self.db._timings.append((a[0],time.time()-t0)) self.db._timings.append((command,time.time()-t0))
del self.db._timings[:-TIMINGSSIZE] del self.db._timings[:-TIMINGSSIZE]
return ret return ret
@@ -1637,6 +1644,7 @@ class BaseAdapter(ConnectionPool):
self.parsemap = { self.parsemap = {
'id':self.parse_id, 'id':self.parse_id,
'integer':self.parse_integer, 'integer':self.parse_integer,
'float':self.parse_double,
'double':self.parse_double, 'double':self.parse_double,
'reference':self.parse_reference, 'reference':self.parse_reference,
'boolean':self.parse_boolean, 'boolean':self.parse_boolean,
@@ -1975,6 +1983,7 @@ class MySQLAdapter(BaseAdapter):
'blob': 'LONGBLOB', 'blob': 'LONGBLOB',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'float': 'FLOAT',
'double': 'DOUBLE', 'double': 'DOUBLE',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
@@ -2078,6 +2087,7 @@ class PostgreSQLAdapter(BaseAdapter):
'blob': 'BYTEA', 'blob': 'BYTEA',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INTEGER', 'integer': 'INTEGER',
'float': 'FLOAT',
'double': 'FLOAT8', 'double': 'FLOAT8',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
@@ -2366,7 +2376,8 @@ class OracleAdapter(BaseAdapter):
'blob': 'CLOB', 'blob': 'CLOB',
'upload': 'VARCHAR2(%(length)s)', 'upload': 'VARCHAR2(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'double': 'FLOAT', 'float': 'FLOAT',
'double': 'DOUBLE',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
'time': 'CHAR(8)', 'time': 'CHAR(8)',
@@ -2500,6 +2511,7 @@ class MSSQLAdapter(BaseAdapter):
'blob': 'IMAGE', 'blob': 'IMAGE',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'float': 'FLOAT',
'double': 'FLOAT', 'double': 'FLOAT',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATETIME', 'date': 'DATETIME',
@@ -2688,6 +2700,7 @@ class MSSQL2Adapter(MSSQLAdapter):
'blob': 'IMAGE', 'blob': 'IMAGE',
'upload': 'NVARCHAR(%(length)s)', 'upload': 'NVARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'float': 'FLOAT',
'double': 'FLOAT', 'double': 'FLOAT',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATETIME', 'date': 'DATETIME',
@@ -2726,6 +2739,7 @@ class FireBirdAdapter(BaseAdapter):
'blob': 'BLOB SUB_TYPE 0', 'blob': 'BLOB SUB_TYPE 0',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INTEGER', 'integer': 'INTEGER',
'float': 'FLOAT',
'double': 'DOUBLE PRECISION', 'double': 'DOUBLE PRECISION',
'decimal': 'DECIMAL(%(precision)s,%(scale)s)', 'decimal': 'DECIMAL(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
@@ -2897,7 +2911,8 @@ class InformixAdapter(BaseAdapter):
'blob': 'BLOB SUB_TYPE 0', 'blob': 'BLOB SUB_TYPE 0',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INTEGER', 'integer': 'INTEGER',
'double': 'FLOAT', 'float': 'FLOAT',
'double': 'DOUBLE PRECISION',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
'time': 'CHAR(8)', 'time': 'CHAR(8)',
@@ -3009,6 +3024,7 @@ class DB2Adapter(BaseAdapter):
'blob': 'BLOB', 'blob': 'BLOB',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'float': 'REAL',
'double': 'DOUBLE', 'double': 'DOUBLE',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
@@ -3092,6 +3108,7 @@ class TeradataAdapter(BaseAdapter):
'blob': 'BLOB', 'blob': 'BLOB',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'float': 'REAL',
'double': 'DOUBLE', 'double': 'DOUBLE',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
@@ -3311,6 +3328,7 @@ class IngresAdapter(BaseAdapter):
'blob': 'BLOB', 'blob': 'BLOB',
'upload': 'VARCHAR(%(length)s)', ## FIXME utf8 or nvarchar... or blob? what is this type? 'upload': 'VARCHAR(%(length)s)', ## FIXME utf8 or nvarchar... or blob? what is this type?
'integer': 'INTEGER4', # or int8... 'integer': 'INTEGER4', # or int8...
'float': 'FLOAT',
'double': 'FLOAT8', 'double': 'FLOAT8',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'ANSIDATE', 'date': 'ANSIDATE',
@@ -3407,6 +3425,7 @@ class IngresUnicodeAdapter(IngresAdapter):
'blob': 'BLOB', 'blob': 'BLOB',
'upload': 'VARCHAR(%(length)s)', ## FIXME utf8 or nvarchar... or blob? what is this type? 'upload': 'VARCHAR(%(length)s)', ## FIXME utf8 or nvarchar... or blob? what is this type?
'integer': 'INTEGER4', # or int8... 'integer': 'INTEGER4', # or int8...
'float': 'FLOAT',
'double': 'FLOAT8', 'double': 'FLOAT8',
'decimal': 'NUMERIC(%(precision)s,%(scale)s)', 'decimal': 'NUMERIC(%(precision)s,%(scale)s)',
'date': 'ANSIDATE', 'date': 'ANSIDATE',
@@ -3433,7 +3452,8 @@ class SAPDBAdapter(BaseAdapter):
'blob': 'LONG', 'blob': 'LONG',
'upload': 'VARCHAR(%(length)s)', 'upload': 'VARCHAR(%(length)s)',
'integer': 'INT', 'integer': 'INT',
'double': 'FLOAT', 'float': 'FLOAT',
'double': 'DOUBLE PRECISION',
'decimal': 'FIXED(%(precision)s,%(scale)s)', 'decimal': 'FIXED(%(precision)s,%(scale)s)',
'date': 'DATE', 'date': 'DATE',
'time': 'TIME', 'time': 'TIME',
@@ -3856,6 +3876,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
'blob': gae.BlobProperty, 'blob': gae.BlobProperty,
'upload': gae.StringProperty, 'upload': gae.StringProperty,
'integer': gae.IntegerProperty, 'integer': gae.IntegerProperty,
'float': gae.FloatProperty,
'double': gae.FloatProperty, 'double': gae.FloatProperty,
'decimal': GAEDecimalProperty, 'decimal': GAEDecimalProperty,
'date': gae.DateProperty, 'date': gae.DateProperty,
@@ -4182,6 +4203,7 @@ class CouchDBAdapter(NoSQLAdapter):
'blob': str, 'blob': str,
'upload': str, 'upload': str,
'integer': long, 'integer': long,
'float': float,
'double': float, 'double': float,
'date': datetime.date, 'date': datetime.date,
'time': datetime.time, 'time': datetime.time,
@@ -4381,6 +4403,7 @@ class MongoDBAdapter(NoSQLAdapter):
'blob': str, 'blob': str,
'upload': str, 'upload': str,
'integer': long, 'integer': long,
'float': float,
'double': float, 'double': float,
'date': datetime.date, 'date': datetime.date,
'time': datetime.time, 'time': datetime.time,
@@ -5912,7 +5935,7 @@ def sqlhtml_validators(field):
requires.append(validators.IS_LENGTH(field_length)) requires.append(validators.IS_LENGTH(field_length))
elif field_type == 'password': elif field_type == 'password':
requires.append(validators.IS_LENGTH(field_length)) requires.append(validators.IS_LENGTH(field_length))
elif field_type == 'double': elif field_type == 'double' or field_type == 'float':
requires.append(validators.IS_FLOAT_IN_RANGE(-1e100, 1e100)) requires.append(validators.IS_FLOAT_IN_RANGE(-1e100, 1e100))
elif field_type == 'integer': elif field_type == 'integer':
requires.append(validators.IS_INT_IN_RANGE(-1e100, 1e100)) requires.append(validators.IS_INT_IN_RANGE(-1e100, 1e100))
@@ -6290,6 +6313,7 @@ class DAL(dict):
self._request_tenant = 'request_tenant' self._request_tenant = 'request_tenant'
self._common_fields = [] self._common_fields = []
self._referee_name = '%(table)s' self._referee_name = '%(table)s'
self._legacyid = False
if not str(attempts).isdigit() or attempts < 0: if not str(attempts).isdigit() or attempts < 0:
attempts = 5 attempts = 5
if uri: if uri:
@@ -6434,7 +6458,8 @@ def index():
tag += '/{%s.%s}' % (table,field) tag += '/{%s.%s}' % (table,field)
patterns.append(tag) patterns.append(tag)
patterns.append(tag+'/:field') patterns.append(tag+'/:field')
elif f.type.startswith('double') or f.type.startswith('integer'): elif f.type.startswith('float') or \
f.type.startswith('double') or f.type.startswith('integer'):
tag += '/{%s.%s.ge}/{%s.%s.lt}' % (table,field,table,field) tag += '/{%s.%s.ge}/{%s.%s.lt}' % (table,field,table,field)
patterns.append(tag) patterns.append(tag)
patterns.append(tag+'/:field') patterns.append(tag+'/:field')
@@ -7315,7 +7340,7 @@ class Table(dict):
value = None value = None
elif field.type=='blob': elif field.type=='blob':
value = base64.b64decode(value) value = base64.b64decode(value)
elif field.type=='double': elif field.type=='double' or field.type=='float':
if not value.strip(): if not value.strip():
value = None value = None
else: else:
@@ -7494,7 +7519,7 @@ class Expression(object):
def __sub__(self, other): def __sub__(self, other):
if self.type == 'integer': if self.type == 'integer':
result_type = 'integer' result_type = 'integer'
elif self.type in ['date','time','datetime','double']: elif self.type in ['date','time','datetime','double','float']:
result_type = 'double' result_type = 'double'
else: else:
raise SyntaxError, "subtraction operation not supported for type" raise SyntaxError, "subtraction operation not supported for type"