From 23294241b10d162c3eb90353bfec5735711a7eab Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 30 Jul 2010 15:15:03 -0700 Subject: PERF: reducing call stack --- lib/arel/algebra/relations/utilities/compound.rb | 8 ++++++++ lib/arel/engines/sql/relations.rb | 1 - lib/arel/engines/sql/relations/utilities/compound.rb | 10 ---------- 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 lib/arel/engines/sql/relations/utilities/compound.rb diff --git a/lib/arel/algebra/relations/utilities/compound.rb b/lib/arel/algebra/relations/utilities/compound.rb index 80ac0b1351..8a8f3ab609 100644 --- a/lib/arel/algebra/relations/utilities/compound.rb +++ b/lib/arel/algebra/relations/utilities/compound.rb @@ -18,6 +18,14 @@ module Arel @projections = nil end + def table + @relation.table + end + + def table_sql(formatter = Sql::TableReference.new(self)) + @relation.table_sql formatter + end + [:wheres, :groupings, :orders, :havings, :projections].each do |operation_name| class_eval <<-OPERATION, __FILE__, __LINE__ def #{operation_name} diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb index c692683421..d1711d058f 100644 --- a/lib/arel/engines/sql/relations.rb +++ b/lib/arel/engines/sql/relations.rb @@ -1,4 +1,3 @@ -require 'arel/engines/sql/relations/utilities/compound' require 'arel/engines/sql/relations/utilities/nil' require 'arel/engines/sql/relations/compiler' require 'arel/engines/sql/relations/table' diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb deleted file mode 100644 index 55853be742..0000000000 --- a/lib/arel/engines/sql/relations/utilities/compound.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Arel - class Compound - delegate :table, :table_sql, :to => :relation - - def build_query(*parts) - parts.compact.join(" ") - end - end -end - -- cgit v1.2.3