Changeset 83 for elixir/trunk/elixir/entity.py

Timestamp:

03/05/07 21:32:53 (6 years ago)

Author:

ged

Message:

- Added support for the "version_id_col" option on entities. This option adds

a column to the table which will be used to prevent concurrent modifications
on any row of the entity's table (i.e. it will raise an error if it happens).

- Using invalid options on entities will now raise an exception

Files:

• elixir/trunk/elixir/entity.py (modified) (4 diffs)

elixir/trunk/elixir/entity.py

@@ -25 +25 @@
 DEFAULT_AUTO_PRIMARYKEY_NAME = "id"
 DEFAULT_AUTO_PRIMARYKEY_TYPE = Integer
-
+DEFAULT_VERSION_ID_COL = "row_version"
 
 class EntityDescriptor(object):
@@ -70 +70 @@
 
         for option in ('inheritance', 
-                       'autoload', 'shortnames', 'auto_primarykey'):
+                       'autoload', 'shortnames', 'auto_primarykey',
+                       'version_id_col'):
             setattr(self, option, options_defaults[option])
 
@@ -141 +142 @@
             kwargs['order_by'] = self.translate_order_by(self.order_by)
         
+        if self.version_id_col:
+            kwargs['version_id_col'] = self.fields[self.version_id_col].column
+
         if self.parent:
             if self.inheritance == 'single':
@@ -192 +196 @@
 #                for field in self.fields.itervalues():
 #                    self.add_field(field)
+
+        if self.version_id_col:
+            if not isinstance(self.version_id_col, basestring):
+                self.version_id_col = DEFAULT_VERSION_ID_COL
+            self.add_field(Field(Integer, colname=self.version_id_col))
 
         if not self.autoload: