Changeset 269

Timestamp:

11/30/07 09:15:19 (4 years ago)

Author:

ged

Message:

- the columns created by ManyToOne relationships create an index by default,

but this is only a default now instead of an hardcoded value: it can be
disabled now (through column_kwargs). Suggestion by Jason R. Coombs.

- added example of GenericProperty in docstring

Location:

elixir/trunk/elixir

Files:

• properties.py (modified) (1 diff)
• relationships.py (modified) (2 diffs)

elixir/trunk/elixir/properties.py

@@ -126 +126 @@
     '''
     Generic catch-all class to wrap an SQLAlchemy property.
+
+    .. sourcecode:: python
+
+        class OrderLine(Entity):
+            quantity = Field(Float)
+            unit_price = Field(Numeric)
+            price = GenericProperty(lambda c: column_property(
+                             (c.quantity * c.unit_price).label('price')))
     '''
     

elixir/trunk/elixir/relationships.py

@@ -477 +477 @@
         if 'primary_key' in kwargs:
             self.column_kwargs['primary_key'] = kwargs.pop('primary_key')
+        # by default, columns created will have an index.
+        self.column_kwargs.setdefault('index', True)
 
         self.constraint_kwargs = kwargs.pop('constraint_kwargs', {})
@@ -553 +555 @@
                 # we can't add the column to the table directly as the table
                 # might not be created yet.
-                col = Column(colname, pk_col.type, index=True,
-                             **self.column_kwargs)
+                col = Column(colname, pk_col.type, **self.column_kwargs)
                 source_desc.add_column(col)