From 7a51983efc50c8f9092785b1b586f8884dedc01a Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 16:02:10 -0400
Subject: initial implementation of cross-engine join

Conflicts:

	lib/arel/engines/memory/relations/array.rb
	lib/arel/engines/sql/primitives.rb
---
 doc/TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/TODO b/doc/TODO
index 5e3a7ee3ab..901d6ab13f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,8 +1,7 @@
 todo:
-- insertions for in memory
 - cross-engine joins
 - blocks for joins
-- test sql insertions 
+- fix sql insertions 
 - implement mnesia adapter
 
 - rename externalize to derived.
@@ -94,6 +93,7 @@ done:
 - implement joins in memory
 - result sets should be array relations
 - fix AR
+- insertions for in memory
 
 icebox:
 - #bind in Attribute and Expression should be doing a descend?
-- 
cgit v1.2.3