diff --git a/VERSION b/VERSION index 6c9c622c..2aca0485 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-19 13:53:42) dev +Version 2.00.0 (2012-08-19 15:02:35) dev diff --git a/gluon/dal.py b/gluon/dal.py index 3054796a..bbe999ea 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -6763,7 +6763,7 @@ def index(): patterns += auto_table(rtable,base=tag,depth=depth-1) return patterns - if patterns=='auto': + if patterns==DEFAULT: patterns=[] for table in db.tables: if not table.startswith('auth_'): @@ -6943,7 +6943,7 @@ def index(): table_class = args.get('table_class',Table) table = table_class(self, tablename, *fields, **args) table._actual = True - self[tablename] = table + self[tablename] = table table._create_references() # must follow above line to handle self references migrate = self._migrate_enabled and args.get('migrate',self._migrate) @@ -7283,7 +7283,7 @@ class Table(dict): if self._db and not field.type in ('text','blob') and \ self._db._adapter.maxcharlength < field.length: field.length = self._db._adapter.maxcharlength - if field.requires is DEFAULT: + if field.requires == DEFAULT: field.requires = sqlhtml_validators(field) self.ALL = SQLALL(self) @@ -8069,7 +8069,7 @@ class Field(Expression): length=None, default=DEFAULT, required=False, - requires=None, + requires=DEFAULT, ondelete='CASCADE', notnull=False, unique=False,