diff options
author | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 16:20:40 -0400 |
---|---|---|
committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 16:20:40 -0400 |
commit | dc7b51883b1cc8ad7e525b7315fb575ae77a5b3d (patch) | |
tree | 97f5e4d55baa45f9805eb36a2196bcc12094ae3a /lib/arel/engines | |
parent | 19b2af181009acfcb24d156ca350c148630e6787 (diff) | |
download | rails-dc7b51883b1cc8ad7e525b7315fb575ae77a5b3d.tar.gz rails-dc7b51883b1cc8ad7e525b7315fb575ae77a5b3d.tar.bz2 rails-dc7b51883b1cc8ad7e525b7315fb575ae77a5b3d.zip |
Whitespace
Diffstat (limited to 'lib/arel/engines')
28 files changed, 50 insertions, 50 deletions
diff --git a/lib/arel/engines/memory.rb b/lib/arel/engines/memory.rb index df6f6f3d48..9e7193ef13 100644 --- a/lib/arel/engines/memory.rb +++ b/lib/arel/engines/memory.rb @@ -1,4 +1,4 @@ require 'arel/engines/memory/relations' require 'arel/engines/memory/primitives' require 'arel/engines/memory/engine' -require 'arel/engines/memory/predicates'
\ No newline at end of file +require 'arel/engines/memory/predicates' diff --git a/lib/arel/engines/memory/engine.rb b/lib/arel/engines/memory/engine.rb index c8f79c9d57..c7ac9422d4 100644 --- a/lib/arel/engines/memory/engine.rb +++ b/lib/arel/engines/memory/engine.rb @@ -5,7 +5,7 @@ module Arel def read(relation) relation.eval end - + def create(relation) relation.eval end @@ -13,4 +13,4 @@ module Arel include CRUD end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb index f8bbcedb55..935b34f5ee 100644 --- a/lib/arel/engines/memory/primitives.rb +++ b/lib/arel/engines/memory/primitives.rb @@ -4,24 +4,24 @@ module Arel row[self] end end - + class Value def eval(row) value end end - + class Ordering def eval(row1, row2) (attribute.eval(row1) <=> attribute.eval(row2)) * direction end end - + class Descending < Ordering def direction; -1 end end - + class Ascending < Ordering def direction; 1 end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/memory/relations/array.rb b/lib/arel/engines/memory/relations/array.rb index 6e2dc29252..5e7c0a4ab1 100644 --- a/lib/arel/engines/memory/relations/array.rb +++ b/lib/arel/engines/memory/relations/array.rb @@ -3,7 +3,7 @@ module Arel attributes :array, :attribute_names include Recursion::BaseCase deriving :==, :initialize - + def engine @engine ||= Memory::Engine.new end @@ -17,9 +17,9 @@ module Arel def format(attribute, value) value end - + def eval @array.collect { |r| Row.new(self, r) } end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb index 9e7827dfb3..6dda92a6a1 100644 --- a/lib/arel/engines/memory/relations/compound.rb +++ b/lib/arel/engines/memory/relations/compound.rb @@ -1,7 +1,7 @@ module Arel class Compound < Relation delegate :array, :to => :relation - + def unoperated_rows relation.call.collect { |row| row.bind(self) } end diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb index e0fd2824b3..8e01938360 100644 --- a/lib/arel/engines/memory/relations/operations.rb +++ b/lib/arel/engines/memory/relations/operations.rb @@ -4,7 +4,7 @@ module Arel unoperated_rows.select { |row| predicate.eval(row) } end end - + class Order < Compound def eval unoperated_rows.sort do |row1, row2| @@ -13,37 +13,37 @@ module Arel end end end - + class Project < Compound def eval unoperated_rows.collect { |r| r.slice(*projections) } end end - + class Take < Compound def eval unoperated_rows[0, taken] end end - + class Skip < Compound def eval unoperated_rows[skipped..-1] end end - + class Group < Compound def eval raise NotImplementedError end end - + class Alias < Compound def eval unoperated_rows end end - + class Join < Relation def eval result = [] @@ -58,4 +58,4 @@ module Arel result end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/memory/relations/writes.rb b/lib/arel/engines/memory/relations/writes.rb index fa8b84a32c..12c4f36c0d 100644 --- a/lib/arel/engines/memory/relations/writes.rb +++ b/lib/arel/engines/memory/relations/writes.rb @@ -1,7 +1,7 @@ module Arel class Insert < Compound def eval - unoperated_rows + [Row.new(self, record.values.collect(&:value))] + unoperated_rows + [Row.new(self, record.values.collect(&:value))] end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql.rb b/lib/arel/engines/sql.rb index aed1fd861e..f31cfc7dac 100644 --- a/lib/arel/engines/sql.rb +++ b/lib/arel/engines/sql.rb @@ -4,4 +4,4 @@ require 'arel/engines/sql/primitives' require 'arel/engines/sql/predicates' require 'arel/engines/sql/formatters' require 'arel/engines/sql/extensions' -require 'arel/engines/sql/christener'
\ No newline at end of file +require 'arel/engines/sql/christener' diff --git a/lib/arel/engines/sql/christener.rb b/lib/arel/engines/sql/christener.rb index 5883a75f41..c1c9325208 100644 --- a/lib/arel/engines/sql/christener.rb +++ b/lib/arel/engines/sql/christener.rb @@ -10,4 +10,4 @@ module Arel end end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb index d27d93a5dc..5a8c9f16c5 100644 --- a/lib/arel/engines/sql/engine.rb +++ b/lib/arel/engines/sql/engine.rb @@ -21,11 +21,11 @@ module Arel def read(relation) # FIXME rows = connection.select_rows(relation.to_sql) - + class << rows include Enumerable end - + Array.new(rows, relation.attributes) end @@ -40,4 +40,4 @@ module Arel include CRUD end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/extensions.rb b/lib/arel/engines/sql/extensions.rb index 6f4ad32148..1ea31bc140 100644 --- a/lib/arel/engines/sql/extensions.rb +++ b/lib/arel/engines/sql/extensions.rb @@ -1,4 +1,4 @@ require 'arel/engines/sql/extensions/object' require 'arel/engines/sql/extensions/array' require 'arel/engines/sql/extensions/range' -require 'arel/engines/sql/extensions/nil_class'
\ No newline at end of file +require 'arel/engines/sql/extensions/nil_class' diff --git a/lib/arel/engines/sql/extensions/array.rb b/lib/arel/engines/sql/extensions/array.rb index 1daa5abca7..d97dd1aa25 100644 --- a/lib/arel/engines/sql/extensions/array.rb +++ b/lib/arel/engines/sql/extensions/array.rb @@ -6,4 +6,4 @@ class Array def inclusion_predicate_sql "IN" end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/extensions/nil_class.rb b/lib/arel/engines/sql/extensions/nil_class.rb index 729c4cada7..6f38ecdf3a 100644 --- a/lib/arel/engines/sql/extensions/nil_class.rb +++ b/lib/arel/engines/sql/extensions/nil_class.rb @@ -2,4 +2,4 @@ class NilClass def equality_predicate_sql 'IS' end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/extensions/object.rb b/lib/arel/engines/sql/extensions/object.rb index ef990eee2f..65270ee3de 100644 --- a/lib/arel/engines/sql/extensions/object.rb +++ b/lib/arel/engines/sql/extensions/object.rb @@ -6,4 +6,4 @@ class Object def equality_predicate_sql '=' end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/extensions/range.rb b/lib/arel/engines/sql/extensions/range.rb index d7329efe34..946dbc2633 100644 --- a/lib/arel/engines/sql/extensions/range.rb +++ b/lib/arel/engines/sql/extensions/range.rb @@ -2,8 +2,8 @@ class Range def to_sql(formatter = nil) formatter.range self.begin, self.end end - + def inclusion_predicate_sql "BETWEEN" end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb index bc5f0f7c64..08a32843c9 100644 --- a/lib/arel/engines/sql/formatters.rb +++ b/lib/arel/engines/sql/formatters.rb @@ -47,7 +47,7 @@ module Arel class WhereClause < PassThrough end - class OrderClause < PassThrough + class OrderClause < PassThrough def ordering(ordering) "#{quote_table_name(name_for(ordering.attribute.original_relation))}.#{quote_column_name(ordering.attribute.name)} #{ordering.direction_sql}" end diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb index dfeddb2de1..7e195c2605 100644 --- a/lib/arel/engines/sql/predicates.rb +++ b/lib/arel/engines/sql/predicates.rb @@ -34,4 +34,4 @@ module Arel class In < Binary def predicate_sql; operand2.inclusion_predicate_sql end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb index 22ee19dcf0..f2e8e8dabe 100644 --- a/lib/arel/engines/sql/primitives.rb +++ b/lib/arel/engines/sql/primitives.rb @@ -7,7 +7,7 @@ module Arel def type_cast(value) root.relation.format(self, value) end - + def format(object) object.to_sql(Sql::Attribute.new(self)) end @@ -28,17 +28,17 @@ module Arel object.to_sql(Sql::Value.new(relation)) end end - + class Ordering def to_sql(formatter = Sql::OrderClause.new(relation)) formatter.ordering self end end - + class Ascending < Ordering def direction_sql; 'ASC' end end - + class Descending < Ordering def direction_sql; 'DESC' end end @@ -72,4 +72,4 @@ module Arel class Average < Expression def function_sql; 'AVG' end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb index 0eb1303ec9..8360a1f806 100644 --- a/lib/arel/engines/sql/relations.rb +++ b/lib/arel/engines/sql/relations.rb @@ -6,4 +6,4 @@ require 'arel/engines/sql/relations/relation' require 'arel/engines/sql/relations/table' require 'arel/engines/sql/relations/operations/join' require 'arel/engines/sql/relations/operations/alias' -require 'arel/engines/sql/relations/writes'
\ No newline at end of file +require 'arel/engines/sql/relations/writes' diff --git a/lib/arel/engines/sql/relations/operations/alias.rb b/lib/arel/engines/sql/relations/operations/alias.rb index 32c9911a69..9b6a484463 100644 --- a/lib/arel/engines/sql/relations/operations/alias.rb +++ b/lib/arel/engines/sql/relations/operations/alias.rb @@ -2,4 +2,4 @@ module Arel class Alias < Compound include Recursion::BaseCase end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb index f848fd3268..7c5e13510a 100644 --- a/lib/arel/engines/sql/relations/operations/join.rb +++ b/lib/arel/engines/sql/relations/operations/join.rb @@ -30,4 +30,4 @@ module Arel relation2 end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index 5fd4121176..93c146352c 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -25,4 +25,4 @@ module Arel @christener ||= Sql::Christener.new end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb index e842f85ed1..0b6574eedc 100644 --- a/lib/arel/engines/sql/relations/table.rb +++ b/lib/arel/engines/sql/relations/table.rb @@ -19,7 +19,7 @@ module Arel def format(attribute, value) attribute.column.type_cast(value) end - + def column_for(attribute) has_attribute?(attribute) and columns.detect { |c| c.name == attribute.name.to_s } end diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb index 61df196d6e..b63a829c67 100644 --- a/lib/arel/engines/sql/relations/utilities/compound.rb +++ b/lib/arel/engines/sql/relations/utilities/compound.rb @@ -3,4 +3,4 @@ module Arel delegate :table, :table_sql, :to => :relation end end -
\ No newline at end of file + diff --git a/lib/arel/engines/sql/relations/utilities/externalization.rb b/lib/arel/engines/sql/relations/utilities/externalization.rb index 1ac6f2de8e..7f937e8423 100644 --- a/lib/arel/engines/sql/relations/utilities/externalization.rb +++ b/lib/arel/engines/sql/relations/utilities/externalization.rb @@ -11,4 +11,4 @@ module Arel relation.name + '_external' end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/utilities/nil.rb b/lib/arel/engines/sql/relations/utilities/nil.rb index 77534b25ad..519ea8acf1 100644 --- a/lib/arel/engines/sql/relations/utilities/nil.rb +++ b/lib/arel/engines/sql/relations/utilities/nil.rb @@ -3,4 +3,4 @@ module Arel def table_sql(formatter = nil); '' end def name; '' end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/utilities/recursion.rb b/lib/arel/engines/sql/relations/utilities/recursion.rb index 848b059507..84a526f57c 100644 --- a/lib/arel/engines/sql/relations/utilities/recursion.rb +++ b/lib/arel/engines/sql/relations/utilities/recursion.rb @@ -10,4 +10,4 @@ module Arel end end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb index edfd9f7233..4d753f5fca 100644 --- a/lib/arel/engines/sql/relations/writes.rb +++ b/lib/arel/engines/sql/relations/writes.rb @@ -33,4 +33,4 @@ module Arel ].join("\n") end end -end
\ No newline at end of file +end |