Searching for one tag works. Two tags acts like or and returns multiple copies.

[zzz-floof.git] / floof / model / __init__.py

diff --git a/floof/model/__init__.py b/floof/model/__init__.py
index e3f810d..9cacd18 100644 (file)
--- a/floof/model/__init__.py
+++ b/floof/model/__init__.py
@@ -1,20 +1,33 @@
 """The application's model objects"""
 """The application's model objects"""

-import sqlalchemy as sa
-from sqlalchemy import orm
-
+import elixir

 from floof.model import meta
 
 from floof.model import meta
 

-# Tables are defined in separate files and imported to here
-from floof.model.users import *
+Session = elixir.session = meta.Session
+# Uncomment if using reflected tables
+# elixir.options_defaults.update({'autoload': True})
+elixir.options_defaults.update({'shortnames':True})
+metadata = elixir.metadata

 
 

+# this will be called in config/environment.py
+# if not using reflected tables

 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""

-    ## Reflected tables must be defined and mapped here
-    #global reflected_table
-    #reflected_table = sa.Table("Reflected", meta.metadata, autoload=True,
-    #                           autoload_with=engine)
-    #orm.mapper(Reflected, reflected_table)
-    #

     meta.Session.configure(bind=engine)
     meta.Session.configure(bind=engine)

-    meta.engine = engine
+    metadata.bind = engine
+
+# Delay the setup if using reflected tables
+if elixir.options_defaults.get('autoload', False) \
+    and not metadata.is_bound():
+    elixir.delay_setup = True
+
+# # import other entities here, e.g.
+# from floof.model.blog import BlogEntry, BlogComment
+from floof.model.art import Art
+from floof.model.users import User, IdentityURL
+
+# Finally, call elixir to set up the tables.
+# but not if using reflected tables
+if not elixir.options_defaults.get('autoload', False):
+    elixir.setup_all()
+