aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-07 15:40:24 -0400
committerGitHub <noreply@github.com>2016-10-07 15:40:24 -0400
commit029041a4dcb2526224ee03efaf242fb84eb442ec (patch)
treef33849a57fac11accd5e3ba3a09c7670c4f47ad4
parent3eddc2fd444c8a0a5f6c96614874d1437b5b55ab (diff)
parenta091539febd3a5a9e5306924b38e0dd681de4a07 (diff)
downloadrails-029041a4dcb2526224ee03efaf242fb84eb442ec.tar.gz
rails-029041a4dcb2526224ee03efaf242fb84eb442ec.tar.bz2
rails-029041a4dcb2526224ee03efaf242fb84eb442ec.zip
Merge pull request #447 from ojab/master
Freeze all the strings in visitors
-rw-r--r--lib/arel/visitors/bind_visitor.rb1
-rw-r--r--lib/arel/visitors/dot.rb3
-rw-r--r--lib/arel/visitors/ibm_db.rb1
-rw-r--r--lib/arel/visitors/informix.rb1
-rw-r--r--lib/arel/visitors/mssql.rb1
-rw-r--r--lib/arel/visitors/mysql.rb1
-rw-r--r--lib/arel/visitors/oracle.rb3
-rw-r--r--lib/arel/visitors/oracle12.rb1
-rw-r--r--lib/arel/visitors/postgresql.rb1
-rw-r--r--lib/arel/visitors/sqlite.rb1
-rw-r--r--lib/arel/visitors/to_sql.rb1
-rw-r--r--lib/arel/visitors/where_sql.rb1
-rw-r--r--test/visitors/test_oracle12.rb2
13 files changed, 15 insertions, 3 deletions
diff --git a/lib/arel/visitors/bind_visitor.rb b/lib/arel/visitors/bind_visitor.rb
index c336e87395..8a5570cf5c 100644
--- a/lib/arel/visitors/bind_visitor.rb
+++ b/lib/arel/visitors/bind_visitor.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
module BindVisitor
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index 31e4a66a1f..85edc50eb7 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class Dot < Arel::Visitors::Visitor
@@ -272,7 +273,7 @@ module Arel
label = "<f0>#{node.name}"
node.fields.each_with_index do |field, i|
- label << "|<f#{i + 1}>#{quote field}"
+ label += "|<f#{i + 1}>#{quote field}"
end
"#{node.id} [label=\"#{label}\"];"
diff --git a/lib/arel/visitors/ibm_db.rb b/lib/arel/visitors/ibm_db.rb
index f1d126790d..e85a5a08a7 100644
--- a/lib/arel/visitors/ibm_db.rb
+++ b/lib/arel/visitors/ibm_db.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class IBM_DB < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/informix.rb b/lib/arel/visitors/informix.rb
index c33ef50554..b53ab18b82 100644
--- a/lib/arel/visitors/informix.rb
+++ b/lib/arel/visitors/informix.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class Informix < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/mssql.rb b/lib/arel/visitors/mssql.rb
index 92362a0c5f..8347d05d06 100644
--- a/lib/arel/visitors/mssql.rb
+++ b/lib/arel/visitors/mssql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class MSSQL < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb
index ac3ad7b470..4c734f6292 100644
--- a/lib/arel/visitors/mysql.rb
+++ b/lib/arel/visitors/mysql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class MySQL < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/oracle.rb b/lib/arel/visitors/oracle.rb
index 4c79c4b038..3b452836db 100644
--- a/lib/arel/visitors/oracle.rb
+++ b/lib/arel/visitors/oracle.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class Oracle < Arel::Visitors::ToSql
@@ -136,7 +137,7 @@ module Arel
array[i] << ',' << part
else
# to ensure that array[i] will be String and not Arel::Nodes::SqlLiteral
- array[i] = '' << part
+ array[i] = part.to_s
end
i += 1 if array[i].count('(') == array[i].count(')')
end
diff --git a/lib/arel/visitors/oracle12.rb b/lib/arel/visitors/oracle12.rb
index 9b722e8c0c..ce90e994ae 100644
--- a/lib/arel/visitors/oracle12.rb
+++ b/lib/arel/visitors/oracle12.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class Oracle12 < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index ef0f0ea2ef..f0991a2f11 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class PostgreSQL < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/sqlite.rb b/lib/arel/visitors/sqlite.rb
index 165e9cb6db..4ae093968b 100644
--- a/lib/arel/visitors/sqlite.rb
+++ b/lib/arel/visitors/sqlite.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class SQLite < Arel::Visitors::ToSql
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 5429bf4ee8..3f61842c3f 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
require 'bigdecimal'
require 'date'
require 'arel/visitors/reduce'
diff --git a/lib/arel/visitors/where_sql.rb b/lib/arel/visitors/where_sql.rb
index 41972d5836..55e6ca9a21 100644
--- a/lib/arel/visitors/where_sql.rb
+++ b/lib/arel/visitors/where_sql.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
module Arel
module Visitors
class WhereSql < Arel::Visitors::ToSql
diff --git a/test/visitors/test_oracle12.rb b/test/visitors/test_oracle12.rb
index 5dac2994cf..43235fd72c 100644
--- a/test/visitors/test_oracle12.rb
+++ b/test/visitors/test_oracle12.rb
@@ -35,7 +35,7 @@ module Arel
stmt.limit = Nodes::Limit.new(10)
stmt.lock = Nodes::Lock.new(Arel.sql('FOR UPDATE'))
assert_raises ArgumentError do
- sql = compile(stmt)
+ compile(stmt)
end
end