From bdca9ed42ffea10aa6989ea3ecebedb424fa01ed Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Sun, 17 May 2009 14:20:29 -0400 Subject: moved sql related code to its own engine area Conflicts: lib/arel/engine.rb lib/arel/extensions/object.rb lib/arel/predicates.rb lib/arel/primitives/attribute.rb lib/arel/primitives/expression.rb lib/arel/primitives/value.rb lib/arel/relations/operations/join.rb lib/arel/relations/relation.rb lib/arel/relations/utilities/externalization.rb lib/arel/relations/utilities/nil.rb lib/arel/relations/writes/delete.rb lib/arel/relations/writes/insert.rb lib/arel/relations/writes/update.rb spec/arel/unit/relations/skip_spec.rb spec/arel/unit/relations/take_spec.rb spec/spec_helper.rb --- lib/arel.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/arel.rb') diff --git a/lib/arel.rb b/lib/arel.rb index 00bfa1e292..f22287fcc5 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -7,9 +7,8 @@ require 'active_record/connection_adapters/abstract/quoting' require 'arel/arel' require 'arel/extensions' -require 'arel/sql' require 'arel/predicates' require 'arel/relations' -require 'arel/engine' +require 'arel/engines' require 'arel/session' require 'arel/primitives' -- cgit v1.2.3 From 7032a50297fce4d7724d1735e81e5df5fd919e71 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Sun, 17 May 2009 14:31:04 -0400 Subject: reorganized file structures Conflicts: lib/arel.rb lib/arel/arel.rb lib/arel/engines/memory/predicates.rb lib/arel/engines/memory/relations/array.rb lib/arel/engines/sql/relations/table.rb --- lib/arel.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/arel.rb') diff --git a/lib/arel.rb b/lib/arel.rb index f22287fcc5..fcca60758e 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -5,10 +5,6 @@ require 'activesupport' require 'activerecord' require 'active_record/connection_adapters/abstract/quoting' -require 'arel/arel' -require 'arel/extensions' -require 'arel/predicates' -require 'arel/relations' +require 'arel/algebra' require 'arel/engines' require 'arel/session' -require 'arel/primitives' -- cgit v1.2.3