rails--rails/lib/arel.rb

$LOAD_PATH.unshift(File.dirname(__FILE__))

require 'rubygems'
require 'activesupport'
require 'active_support/dependencies'
require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/module/delegation'
require 'activerecord'
require 'active_record/connection_adapters/abstract/quoting'

require 'arel/algebra'
require 'arel/engines'
require 'arel/session'
officially renamed active_relation to arel 2008-04-18 15:59:29 -04:00			`$LOAD_PATH.unshift(File.dirname(__FILE__))`

			`require 'rubygems'`
			`require 'activesupport'`
Merge commit 'brynary/master' Conflicts: lib/arel.rb lib/arel/session.rb 2009-05-26 11:41:52 -04:00			`require 'active_support/dependencies'`
			`require 'active_support/core_ext/class/attribute_accessors'`
			`require 'active_support/core_ext/module/delegation'`
officially renamed active_relation to arel 2008-04-18 15:59:29 -04:00			`require 'activerecord'`
Moved require to initializer 2009-04-23 10:52:48 -04:00			`require 'active_record/connection_adapters/abstract/quoting'`
officially renamed active_relation to arel 2008-04-18 15:59:29 -04:00
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 2009-05-17 14:31:04 -04:00			`require 'arel/algebra'`
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 2009-05-17 14:20:29 -04:00			`require 'arel/engines'`
reorganized file structure 2008-05-19 17:08:42 -04:00			`require 'arel/session'`