diff --git a/VERSION b/VERSION index a7c091cf..08b1ed27 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.5.1-stable+timestamp.2013.06.22.01.45.55 +Version 2.5.1-stable+timestamp.2013.06.22.23.52.14 diff --git a/gluon/dal.py b/gluon/dal.py index 3b9f9f26..1b90030c 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -135,7 +135,6 @@ help(Field) __all__ = ['DAL', 'Field'] -MAXCHARLENGTH = 2**15 # not quite but reasonable default max char length DEFAULTLENGTH = {'string':512, 'password':512, 'upload':512, @@ -637,7 +636,6 @@ class BaseAdapter(ConnectionPool): driver_name = None drivers = () # list of drivers from which to pick connection = None - maxcharlength = MAXCHARLENGTH commit_on_alter_table = False support_distributed_transaction = False uploads_in_blob = False @@ -2401,7 +2399,6 @@ class JDBCSQLiteAdapter(SQLiteAdapter): class MySQLAdapter(BaseAdapter): drivers = ('MySQLdb','pymysql') - maxcharlength = 255 commit_on_alter_table = True support_distributed_transaction = True types = { @@ -8272,9 +8269,6 @@ class Table(object): field.tablename = field._tablename = tablename field.table = field._table = self field.db = field._db = db - if db and not field.type in ('text', 'blob', 'json') and \ - db._adapter.maxcharlength < field.length: - field.length = db._adapter.maxcharlength self.ALL = SQLALL(self) if hasattr(self,'_primarykey'): @@ -9237,10 +9231,6 @@ class Field(Expression): string, boolean, integer, double, text, blob, date, time, datetime, upload, password - strings must have a length of Adapter.maxcharlength by default (512 or 255 for mysql) - fields should have a default or they will be required in SQLFORMs - the requires argument is used to validate the field input in SQLFORMs - """ def __init__(