This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 1.99.4 (2011-12-22 11:20:45) stable
|
Version 1.99.4 (2011-12-24 10:52:51) stable
|
||||||
|
|||||||
+10
-2
@@ -4766,7 +4766,7 @@ class DAL(dict):
|
|||||||
migrate = fake_migrate = False
|
migrate = fake_migrate = False
|
||||||
adapter = self._adapter
|
adapter = self._adapter
|
||||||
self._uri_hash = hashlib.md5(adapter.uri).hexdigest()
|
self._uri_hash = hashlib.md5(adapter.uri).hexdigest()
|
||||||
self.tables = SQLCallableList()
|
self._tables = SQLCallableList()
|
||||||
self.check_reserved = check_reserved
|
self.check_reserved = check_reserved
|
||||||
if self.check_reserved:
|
if self.check_reserved:
|
||||||
from reserved_sql_keywords import ADAPTERS as RSK
|
from reserved_sql_keywords import ADAPTERS as RSK
|
||||||
@@ -4778,6 +4778,10 @@ class DAL(dict):
|
|||||||
if auto_import:
|
if auto_import:
|
||||||
self.import_table_definitions(adapter.folder)
|
self.import_table_definitions(adapter.folder)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def tables(self):
|
||||||
|
return self._tables
|
||||||
|
|
||||||
def import_table_definitions(self,path,migrate=False,fake_migrate=False):
|
def import_table_definitions(self,path,migrate=False,fake_migrate=False):
|
||||||
pattern = os.path.join(path,self._uri_hash+'_*.table')
|
pattern = os.path.join(path,self._uri_hash+'_*.table')
|
||||||
for filename in glob.glob(pattern):
|
for filename in glob.glob(pattern):
|
||||||
@@ -5374,7 +5378,7 @@ class Table(dict):
|
|||||||
fields = newfields
|
fields = newfields
|
||||||
self._db = db
|
self._db = db
|
||||||
tablename = tablename
|
tablename = tablename
|
||||||
self.fields = SQLCallableList()
|
self._fields = SQLCallableList()
|
||||||
self.virtualfields = []
|
self.virtualfields = []
|
||||||
fields = list(fields)
|
fields = list(fields)
|
||||||
|
|
||||||
@@ -5421,6 +5425,10 @@ class Table(dict):
|
|||||||
else:
|
else:
|
||||||
self[k].notnull = True
|
self[k].notnull = True
|
||||||
|
|
||||||
|
@property
|
||||||
|
def fields(self):
|
||||||
|
return self._fields
|
||||||
|
|
||||||
def update(self,*args,**kwargs):
|
def update(self,*args,**kwargs):
|
||||||
raise RuntimeError, "Syntax Not Supported"
|
raise RuntimeError, "Syntax Not Supported"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user