From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Nov 2010 22:13:07 +0000 (-0500)
Subject: - add docs for hybrid
X-Git-Tag: rel_0_7b1~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf9933942c824613b9869518bdfcc997a87da46;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add docs for hybrid
---

diff --git a/doc/build/orm/extensions/hybrid.rst b/doc/build/orm/extensions/hybrid.rst
new file mode 100644
index 0000000000..e986f17021
--- /dev/null
+++ b/doc/build/orm/extensions/hybrid.rst
@@ -0,0 +1,12 @@
+Hybrid Attributes
+=================
+
+.. automodule:: sqlalchemy.ext.hybrid
+
+API Reference
+-------------
+
+.. autoclass:: method
+.. autoclass:: property_
+.. autoclass:: Comparator
+
diff --git a/doc/build/orm/extensions/index.rst b/doc/build/orm/extensions/index.rst
index 5033ad5e90..05f86771ca 100644
--- a/doc/build/orm/extensions/index.rst
+++ b/doc/build/orm/extensions/index.rst
@@ -14,5 +14,6 @@ functionality to the core behavior.
     declarative
     orderinglist
     horizontal_shard
+    hybrid
     sqlsoup
 
diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index 5bb158413b..b499490718 100644
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -42,25 +42,10 @@ or as the class itself::
     
         @hybrid.method
         def intersects(self, other):
-            return (self.start < other.end) & (self.end > other.start)
+            return self.contains(other.start) | self.contains(other.end)
 
-    mapper(Interval1, interval_table1)
 
-    session = sessionmaker(engine)()
-
-    session.add_all(
-        [Interval1(1,4), Interval1(3,15), Interval1(11,16)]
-    )
-    intervals = 
-
-    for interval in intervals:
-        session.add(interval)
-        session.add(Interval2(interval.start, interval.length))
-
-    session.commit()
-
-    ### TODO ADD EXAMPLES HERE AND STUFF THIS ISN'T FINISHED ###
-    
+        
 """
 from sqlalchemy import util
 from sqlalchemy.orm import attributes, interfaces