Changeset 82 for elixir/trunk/elixir/__init__.py

Timestamp:

03/05/07 18:03:08 (6 years ago)

Author:

ged

Message:

- Added support for autoloading/reflecting databases with

has_and_belongs_to_many relationships. The tablename argument is now
optional, but still recommended, otherwise you'll have to use the same exact
name for your intermediary table than the one generated.

- Made the colname argument optional for belongs_to relationships in

autoloaded entities. It is only required to specify it if you have several
belongs_to relationships between two entities/tables.

- Fixed bug preventing having entities without any statement.
- Made some PEP8 tweaks in many places. Used the pep8 script provided with

Cheesecake.

- Foreign key names generated by belongs_to relationships use column names

instead of relation names in case we have a relation with the same name
defined in several entities inheriting from the same entity using single-
table inheritance (and we set a custom column name in one of them to avoid
a column-name conflict).

- 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).

- Some cleanup/useless code removal (namely the foreign_key stuff in

relationships).

Files:

• elixir/trunk/elixir/__init__.py (modified) (6 diffs)

elixir/trunk/elixir/__init__.py

@@ -1 +1 @@
 '''
 Elixir package
-    
+
 A declarative layer on top of SQLAlchemy, which is intended to replace the
 ActiveMapper SQLAlchemy extension, and the TurboEntity project.  Elixir is a
-fairly thin wrapper around SQLAlchemy, which provides the ability to define 
-model objects following the Active Record design pattern, and using a DSL 
+fairly thin wrapper around SQLAlchemy, which provides the ability to define
+model objects following the Active Record design pattern, and using a DSL
 syntax similar to that of the Ruby on Rails ActiveRecord system.
 
-Elixir does not intend to replace SQLAlchemy's core features, but instead 
+Elixir does not intend to replace SQLAlchemy's core features, but instead
 focuses on providing a simpler syntax for defining model objects when you do
 not need the full expressiveness of SQLAlchemy's manual mapper definitions.
@@ -31 +31 @@
     from sets import Set as set
 
-__all__ = ['Entity', 'Field', 'has_field', 'with_fields', 
-           'belongs_to', 'has_one', 'has_many', 'has_and_belongs_to_many', 
+__all__ = ['Entity', 'Field', 'has_field', 'with_fields',
+           'belongs_to', 'has_one', 'has_many', 'has_and_belongs_to_many',
            'using_options', 'using_table_options', 'using_mapper_options',
            'options_defaults', 'metadata', 'objectstore',
-           'create_all', 'drop_all', 'setup_all', 'cleanup_all', 
+           'create_all', 'drop_all', 'setup_all', 'cleanup_all',
            'delay_setup'] + \
           sqlalchemy.types.__all__
@@ -51 +51 @@
     # thread local SessionContext
     class Objectstore(object):
+
         def __init__(self, *args, **kwargs):
             self.context = SessionContext(*args, **kwargs)
+
         def __getattr__(self, name):
             return getattr(self.context.current, name)
         session = property(lambda s:s.context.current)
-    
+
     objectstore = Objectstore(sqlalchemy.create_session)
 
 metadatas = set()
+
 
 def create_all():
@@ -65 +68 @@
     for md in metadatas:
         md.create_all()
+
 
 def drop_all():
@@ -74 +78 @@
 delay_setup = False
 
+
 def setup_all():
     '''Setup the table and mapper for all entities which have been delayed.
-    
+
     This should be used in conjunction with setting ``delay_setup`` to ``True``
     before defining your entities.
@@ -95 +100 @@
     create_all()
 
+
 def cleanup_all():
     '''Drop table and clear mapper for all entities, and clear all metadatas.