[Zope-CVS] CVS: Products/Ape/lib/apelib/fs - classification.py:1.7 properties.py:1.7 structure.py:1.12

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/fs
In directory cvs.zope.org:/tmp/cvs-serv1879/lib/apelib/fs

Modified Files:
	classification.py properties.py structure.py 
Log Message:
Merged sql-types-branch.


=== Products/Ape/lib/apelib/fs/classification.py 1.6 => 1.7 ===
--- Products/Ape/lib/apelib/fs/classification.py:1.6	Sat Mar 20 01:34:23 2004
+++ Products/Ape/lib/apelib/fs/classification.py	Wed Jul 21 02:38:05 2004
@@ -17,7 +17,7 @@
 """
 
 from apelib.core.interfaces import IGateway, LoadError, OIDConflictError
-from apelib.core.schemas import FieldSchema
+from apelib.core.schemas import ColumnSchema
 
 from base import FSGatewayBase
 
@@ -27,7 +27,7 @@
 
     __implements__ = IGateway
 
-    schema = FieldSchema('classification', 'classification')
+    schema = ColumnSchema('classification', 'classification')
 
     def load(self, event):
         fs_conn = self.get_connection(event)


=== Products/Ape/lib/apelib/fs/properties.py 1.6 => 1.7 ===
--- Products/Ape/lib/apelib/fs/properties.py:1.6	Sat Mar 20 01:34:23 2004
+++ Products/Ape/lib/apelib/fs/properties.py	Wed Jul 21 02:38:05 2004
@@ -19,7 +19,7 @@
 from types import StringType
 
 from apelib.core.interfaces import IGateway
-from apelib.core.schemas import FieldSchema, RowSequenceSchema
+from apelib.core.schemas import ColumnSchema, RowSequenceSchema
 
 from base import FSGatewayBase
 
@@ -107,7 +107,7 @@
 
     __implements__ = IGateway
 
-    schema = FieldSchema('data', 'string')
+    schema = ColumnSchema('data', 'string')
 
     def __init__(self, annotation, conn_name='fs'):
         self.annotation = str(annotation)


=== Products/Ape/lib/apelib/fs/structure.py 1.11 => 1.12 ===
--- Products/Ape/lib/apelib/fs/structure.py:1.11	Fri Mar 26 10:52:48 2004
+++ Products/Ape/lib/apelib/fs/structure.py	Wed Jul 21 02:38:05 2004
@@ -19,7 +19,7 @@
 from types import StringType
 
 from apelib.core.interfaces import IGateway, LoadError
-from apelib.core.schemas import FieldSchema, RowSequenceSchema
+from apelib.core.schemas import ColumnSchema, RowSequenceSchema
 
 from base import FSGatewayBase
 
@@ -30,7 +30,7 @@
 
     __implements__ = IGateway
 
-    schema = FieldSchema('data', 'string')
+    schema = ColumnSchema('data', 'string')
 
     def __init__(self, text=0, conn_name='fs'):
         if text == 'text':
@@ -61,7 +61,7 @@
 
     __implements__ = IGateway
 
-    schema = FieldSchema('id', 'string')
+    schema = ColumnSchema('id', 'string')
 
     def load(self, event):
         id = self.get_connection(event).read_object_name(event.oid)
@@ -130,7 +130,7 @@
 
     __implements__ = IGateway
 
-    schema = FieldSchema('mtime', 'int')
+    schema = ColumnSchema('mtime', 'int')
 
     def load(self, event):
         fs_conn = self.get_connection(event)