basic eager loading

diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index 0814caf5738f78bd46b4e0ffe85ca382c92e33aa..6ea026159ebd80811c0c599bbfd3e748f99d6b5e 100644 (file)
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -132,3 +132,29 @@ class SQLEngine(schema.SchemaEngine):
 
     def log(self, msg):
         print msg
+
+
+class ResultProxy:
+    def __init__(self, cursor):
+        self.cursor = cursor
+        metadata = cursor.description
+        self.props = {}
+        i = 0
+        for item in metadata:
+            self.props[item[0]] = i
+            self.props[i] = i
+            i+=1
+
+    def fetchone(self):
+        row = self.cursor.fetchone()
+        if row is not None:
+            return RowProxy(self, row)
+        else:
+            return None
+
+class RowProxy:
+    def __init__(self, parent, row):
+        self.parent = parent
+        self.row = row
+    def __getitem__(self, key):
+        return self.row[self.parent.props[key]]

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index 2a178b56b6b10de3acf125d8e06882d187150a3f..ed0ebe3b04de1ba73397efb3492a598922cc0cfa 100644 (file)
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -36,14 +36,16 @@ addressmapper = Mapper(Address, addresses, properties = {
 
 import sqlalchemy.sql as sql
 import sqlalchemy.schema as schema
+import sqlalchemy.engine as engine
 
 class Mapper(object):
-    def __init__(self, class_, selectable, properties = None, identitymap = None):
+    def __init__(self, class_, selectable, table = None, properties = None, identitymap = None):
         self.class_ = class_
-
         self.selectable = selectable
-        self.table = self._find_table(selectable)
-        
+        if table is None:
+            self.table = self._find_table(selectable)
+        else:
+            self.table = table
         self.props = {}
         
         for column in self.selectable.columns:
@@ -60,15 +62,15 @@ class Mapper(object):
             
     def instances(self, cursor):
         result = []
-        cursor = ResultProxy(cursor)
+        cursor = engine.ResultProxy(cursor)
         localmap = IdentityMap()
         while True:
             row = cursor.fetchone()
             if row is None:
                 break
                 
-            identitykey = localmap.get_key(row, self.class_, self.table, self.selectable)
-            if not localmap.map.has_key(identitykey):
+            identitykey = self._identity_key(row)
+            if not localmap.has_key(identitykey):
                 instance = self._create(row, identitykey, localmap)
                 result.append(instance)
             else:
@@ -104,6 +106,8 @@ class Mapper(object):
 
     class TableFinder(sql.ClauseVisitor):
         def visit_table(self, table):
+            if hasattr(self, 'table'):
+                raise "Mapper can only create object instances against a single-table identity - specify the 'table' argument to the Mapper constructor"
             self.table = table
             
     def _find_table(self, selectable):
@@ -131,8 +135,8 @@ class Mapper(object):
                 return None
         for key, prop in self.props.iteritems():
             prop.execute(instance, key, row, identitykey, localmap, False)
-        self.identitymap.map[identitykey] = instance
-        localmap.map[identitykey] = instance
+        self.identitymap[identitykey] = instance
+        localmap[identitykey] = instance
         return instance
 
 
@@ -176,46 +180,10 @@ class EagerLoader(MapperProperty):
             subinstance = self.mapper._create(row, identitykey, localmap)
             list.append(subinstance)
 
-class ResultProxy:
-    def __init__(self, cursor):
-        self.cursor = cursor
-        metadata = cursor.description
-        self.props = {}
-        i = 0
-        for item in metadata:
-            self.props[item[0]] = i
-            self.props[i] = i
-            i+=1
-
-    def fetchone(self):
-        row = self.cursor.fetchone()
-        print "row: " + repr(row)
-        if row is not None:
-            return RowProxy(self, row)
-        else:
-            return None
-        
-class RowProxy:
-    def __init__(self, parent, row):
-        self.parent = parent
-        self.row = row
-    def __getitem__(self, key):
-        return self.row[self.parent.props[key]]
-        
-class IdentityMap(object):
-    def __init__(self):
-        self.map = {}
-        self.keystereotypes = {}
-    
-    def has_key(self, key):
-        return self.map.has_key(key)
         
+class IdentityMap(dict):
     def get_key(self, row, class_, table, selectable):
         return (class_, table, tuple([row[column.label] for column in selectable.primary_keys]))
         
-    def get(self, key):
-        return self.map[key]
-            
-    
-    
+
 _global_identitymap = IdentityMap()

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 7438408d69fef28c20e874d25821ec1cf83dedf4..0bd9fa3826cd0b3880c7214b23f0ce061a1b9075 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -126,6 +126,10 @@ class ClauseElement(object):
         c = self.compile(e, bindparams = params)
         return e.execute(str(c), c.get_params(**params))
 
+    def result(self, **params):
+        e = self._engine()
+        c = self.compile(e, bindparams = params)
+        return e.result(str(c), c.get_params(**params))
         
 class ColumnClause(ClauseElement):
     """represents a column clause element in a SQL statement."""

diff --git a/test/mapper.py b/test/mapper.py
index a2fc249c75cdd93a455fb11c447ec356addab834..3d0ee0b8acdc31a1c095898d03ecd2352f36223c 100644 (file)
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -99,7 +99,6 @@ class MapperTest(PersistTest):
         ), identitymap = mapper.IdentityMap())
         l = m.select()
         print repr(l)
-        print repr(m.identitymap.map)
 
         
     def tearDown(self):