aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.markdown4
-rw-r--r--lib/arel/select_manager.rb3
2 files changed, 2 insertions, 5 deletions
diff --git a/README.markdown b/README.markdown
index 8285bbfd12..75b0b3ee0b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,4 @@
-# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.png)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.png)](https://gemnasium.com/rails/arel)
+# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.svg?branch=master)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.svg)](https://gemnasium.com/rails/arel)
* http://github.com/rails/arel
@@ -206,7 +206,7 @@ users.
When your query is too complex for `Arel`, you can use `Arel::SqlLiteral`:
```ruby
-photo_clicks =Arel::Nodes::SqlLiteral.new(<<-SQL
+photo_clicks = Arel::Nodes::SqlLiteral.new(<<-SQL
CASE WHEN condition1 THEN calculation1
WHEN condition2 THEN calculation2
WHEN condition3 THEN calculation3
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 7ec9fdba79..bb7b1f5b66 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -86,9 +86,6 @@ module Arel
def from table
table = Nodes::SqlLiteral.new(table) if String === table
- # FIXME: this is a hack to support
- # test_with_two_tables_in_from_without_getting_double_quoted
- # from the AR tests.
case table
when Nodes::Join