Changeset 494 for elixir

Timestamp:

10/02/09 14:30:48 (3 years ago)

Author:

ged

Message:

almost functional conversion

Location:

elixir/branches/field_inherits_from_column/elixir

Files:

• fields.py (modified) (6 diffs)
• properties.py (modified) (2 diffs)

elixir/branches/field_inherits_from_column/elixir/fields.py

@@ -116 +116 @@
 
 
-class Field(Property):
+class Field(Column, Property):
     '''
     Represents the definition of a 'field' on an entity.
@@ -122 +122 @@
     This class represents a column on the table where the entity is stored.
     '''
-
+    #FIXME: collision between prop.name & col.name
     def __init__(self, type, *args, **kwargs):
-        super(Field, self).__init__()
+        Property.__init__(self)
 
         self.colname = kwargs.pop('colname', None)
@@ -134 +134 @@
         self.primary_key = kwargs.get('primary_key', False)
 
-        self.column = None
+        Column.__init__(self, type, *args, **kwargs)
         self.property = None
 
@@ -141 +141 @@
 
     def attach(self, entity, name):
+        if self.key is None:
+            self.key = name
+        if self.name is None:
+            self.name = name
+
         # If no colname was defined (through the 'colname' kwarg), set
         # it to the name of the attr.
@@ -155 +160 @@
             self.create_col()
 
+    @property
+    def column(self):
+        return self
+
     def create_col(self):
-        self.column = Column(self.colname, self.type,
-                             *self.args, **self.kwargs)
-        self.add_table_column(self.column)
+        self.add_table_column(self)
 
     def create_properties(self):
@@ -165 +172 @@
             if isinstance(self.deferred, basestring):
                 group = self.deferred
-            self.property = deferred(self.column, group=group)
+            self.property = deferred(self, group=group)
         elif self.name != self.colname:
             # if the property name is different from the column name, we need
             # to add an explicit property (otherwise nothing is needed as it's
             # done automatically by SA)
-            self.property = self.column
+            self.property = self
 
         if self.property is not None:

elixir/branches/field_inherits_from_column/elixir/properties.py

@@ -105 +105 @@
         return instance
 
+_global_counter = 0
 
 class Property(EntityBuilder):
@@ -110 +111 @@
     Abstract base class for all properties of an Entity.
     '''
-    __metaclass__ = CounterMeta
+#    __metaclass__ = CounterMeta
 
     def __init__(self, *args, **kwargs):
+        global _global_counter
         self.entity = None
         self.name = None
+        self._counter = _global_counter
+        _global_counter += 1
 
     def attach(self, entity, name):