aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/arel.rb1
-rw-r--r--lib/arel/engines/sql/relations/table.rb11
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/arel.rb b/lib/arel.rb
index 92a82b695b..857a7f651b 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -1,5 +1,4 @@
require 'active_support/inflector'
-require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/object/blank'
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index c83ce1e5e9..94843ec62d 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -2,7 +2,16 @@ module Arel
class Table
include Relation, Recursion::BaseCase
- cattr_accessor :engine, :tables
+ @@engine = nil
+ @@tables = nil
+ class << self # FIXME: Do we really need these?
+ def engine; @@engine; end
+ def engine= e; @@engine = e; end
+
+ def tables; @@tables; end
+ def tables= e; @@tables = e; end
+ end
+
attr_reader :name, :engine, :table_alias, :options
def initialize(name, options = {})