Changeset 96

Timestamp:

03/27/07 11:15:20 (6 years ago)

Author:

ged

Message:

- The tablename option can now be given a callable so that people can provide

their own function to get the table name for an entity. The tablename option
can now also be set globally (using the options_defaults dictionary). Of
course, this only makes sense for the callable usecase.

Location:

elixir/trunk

Files:

• CHANGES (modified) (2 diffs)
• elixir/entity.py (modified) (2 diffs)
• elixir/options.py (modified) (2 diffs)
• tests/test_options.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -31 +31 @@
   This shouldn't change anything to how it's used but allowed me to factor
   some code with has_and_belongs_to_many relationships.
+- The tablename option can now be given a callable so that people can provide
+  their own function to get the table name for an entity. The tablename option
+  can now also be set globally (using the options_defaults dictionary). Of
+  course, this only makes sense for the callable usecase.
+
 - Fixed bug preventing having entities without any statement.
 - Fixed documentation for belongs_to relationships (the arguemnt is "required",
@@ -40 +45 @@
 - Actually make the code python 2.3 compatible (Robin's patch was based on
   0.1.0 while I had introduced more decorators in the trunk in the mean time).
+
 - Made some PEP8 tweaks in many places. Used the pep8 script provided with 
   Cheesecake.

elixir/trunk/elixir/entity.py

@@ -65 +65 @@
         # set default value for options
         self.order_by = None
-        self.tablename = None
         self.table_args = list()
         self.metadata = getattr(self.module, 'metadata', elixir.metadata)
 
         for option in ('inheritance', 
-                       'autoload', 'shortnames', 'auto_primarykey',
+                       'autoload', 'tablename', 'shortnames', 
+                       'auto_primarykey',
                        'version_id_col'):
             setattr(self, option, options_defaults[option])
@@ -93 +93 @@
                 tablename = "%s_%s" % (modulename, entity.__name__)
                 self.tablename = tablename.lower()
+        elif callable(self.tablename):
+            self.tablename = self.tablename(entity)
     
     def setup(self):

elixir/trunk/elixir/options.py

@@ -45 +45 @@
 |                     | entities.                                             |
 +---------------------+-------------------------------------------------------+
-| ``tablename``       | Specify a custom tablename                            |
+| ``tablename``       | Specify a custom tablename. You can either provide a  |
+|                     | plain string or a callable. The callable will be      |
+|                     | given the entity (ie class) as argument and must      |
+|                     | return a string representing the name of the table    |
+|                     | for that entity.                                      |
 +---------------------+-------------------------------------------------------+
 | ``shortnames``      | Usually tablenames include the full module-path       |
@@ -117 +121 @@
     autoload=None,
     shortnames=False,
+    tablename=None,
     auto_primarykey=True,
     version_id_col=False,

elixir/trunk/tests/test_options.py

@@ -54 +54 @@
             pass
 
+    def test_tablename_func(self):
+        import re
+
+        def camel_to_underscore(entity):
+            return re.sub(r'(.+?)([A-Z])+?', r'\1_\2', entity.__name__).lower()
+
+        options_defaults['tablename'] = camel_to_underscore
+
+        class MyEntity(Entity):
+            has_field('name', Unicode(30))
+
+        class MySuperTestEntity(Entity):
+            has_field('name', Unicode(30))
+
+        assert MyEntity.table.name == 'my_entity'
+        assert MySuperTestEntity.table.name == 'my_super_test_entity'
+
+        options_defaults['tablename'] = None
+
     def teardown(self):
         cleanup_all()