Ticket #21: elixir.patch

elixir/options.py

@@ -157 +157 @@
     table_options=dict(),
 )
 
+colname_format = '%s_%s'
+
 valid_options = options_defaults.keys() + [
     'metadata',
     'session',

elixir/entity.py

@@ -839 +839 @@
         return cls.query.get(*args, **kwargs)
     get = classmethod(get)
 
+    def set(self, **kw):
+        for k in kw:
+            setattr(self, k, kw[k])
+
     #-----------------#
     # DEPRECATED LAND #
     #-----------------#

elixir/relationships.py

@@ -329 +329 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 
 import sys
+import options
 
 __doc_all__ = []
 
@@ -545 +546 @@
                 if self.colname:
                     colname = self.colname[key_num]
                 else:
-                    colname = '%s_%s' % (self.name, pk_col.key)
+                    colname = options.colname_format % (self.name, pk_col.key)
 
                 # we can't add the column to the table directly as the table
                 # might not be created yet.