diff options
-rw-r--r-- | lib/arel/factory_methods.rb | 8 | ||||
-rw-r--r-- | lib/arel/nodes.rb | 2 | ||||
-rw-r--r-- | lib/arel/nodes/false.rb | 6 | ||||
-rw-r--r-- | lib/arel/nodes/true.rb | 6 | ||||
-rw-r--r-- | lib/arel/predications.rb | 1 | ||||
-rw-r--r-- | lib/arel/visitors/to_sql.rb | 8 | ||||
-rw-r--r-- | test/test_factory_methods.rb | 10 | ||||
-rw-r--r-- | test/visitors/test_to_sql.rb | 16 |
8 files changed, 56 insertions, 1 deletions
diff --git a/lib/arel/factory_methods.rb b/lib/arel/factory_methods.rb index 9fd0878ada..3b16feae10 100644 --- a/lib/arel/factory_methods.rb +++ b/lib/arel/factory_methods.rb @@ -2,6 +2,14 @@ module Arel ### # Methods for creating various nodes module FactoryMethods + def create_true + Arel::Nodes::True.new + end + + def create_false + Arel::Nodes::False.new + end + def create_table_alias relation, name Nodes::TableAlias.new(relation, name) end diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 9edf3a9a95..e37b09a8ac 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -8,6 +8,8 @@ require 'arel/nodes/update_statement' # terminal require 'arel/nodes/terminal' +require 'arel/nodes/true' +require 'arel/nodes/false' # unary require 'arel/nodes/unary' diff --git a/lib/arel/nodes/false.rb b/lib/arel/nodes/false.rb new file mode 100644 index 0000000000..611e19633b --- /dev/null +++ b/lib/arel/nodes/false.rb @@ -0,0 +1,6 @@ +module Arel + module Nodes + class False < Arel::Nodes::Node + end + end +end diff --git a/lib/arel/nodes/true.rb b/lib/arel/nodes/true.rb new file mode 100644 index 0000000000..63dd5562e1 --- /dev/null +++ b/lib/arel/nodes/true.rb @@ -0,0 +1,6 @@ +module Arel + module Nodes + class True < Arel::Nodes::Node + end + end +end diff --git a/lib/arel/predications.rb b/lib/arel/predications.rb index 4b124ce05c..e3f72d46a2 100644 --- a/lib/arel/predications.rb +++ b/lib/arel/predications.rb @@ -1,6 +1,5 @@ module Arel module Predications - def not_eq other Nodes::NotEqual.new self, other end diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 933edc15f2..8aec4cb147 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -90,6 +90,14 @@ key on UpdateManager using UpdateManager#key= o.alias ? " AS #{visit o.alias}" : ''}" end + def visit_Arel_Nodes_True o + "TRUE" + end + + def visit_Arel_Nodes_False o + "FALSE" + end + def table_exists? name @pool.table_exists? name end diff --git a/test/test_factory_methods.rb b/test/test_factory_methods.rb index 50f77c3175..21671cd239 100644 --- a/test/test_factory_methods.rb +++ b/test/test_factory_methods.rb @@ -23,6 +23,16 @@ module Arel assert_equal :one, on.expr end + def test_create_true + true_node = @factory.create_true + assert_instance_of Nodes::True, true_node + end + + def test_create_false + false_node = @factory.create_false + assert_instance_of Nodes::False, false_node + end + def test_lower lower = @factory.lower :one assert_instance_of Nodes::NamedFunction, lower diff --git a/test/visitors/test_to_sql.rb b/test/visitors/test_to_sql.rb index b52722ddd6..3b58c71cd8 100644 --- a/test/visitors/test_to_sql.rb +++ b/test/visitors/test_to_sql.rb @@ -325,6 +325,22 @@ module Arel end end + describe 'Constants' do + it "should handle true" do + test = Table.new(:users).create_true + @visitor.accept(test).must_be_like %{ + TRUE + } + end + + it "should handle false" do + test = Table.new(:users).create_false + @visitor.accept(test).must_be_like %{ + FALSE + } + end + end + describe 'TableAlias' do it "should use the underlying table for checking columns" do test = Table.new(:users).alias('zomgusers')[:id].eq '3' |