more interpolated sql in tests

RAILS_VERSION

@@ -1 +1 @@
-2.3.14.github34
+2.3.14.github33

actionpack/lib/action_controller/caching/fragments.rb

@@ -39,9 +39,9 @@ module ActionController #:nodoc:
           if cache = read_fragment(name, options)
             buffer.safe_concat(cache.html_safe)
           else
-            pos = buffer.bytesize
+            pos = buffer.length
             block.call
-            write_fragment(name, buffer.byteslice(pos..-1), options)
+            write_fragment(name, buffer[pos..-1], options)
           end
         else
           block.call

actionpack/lib/action_view/template_handlers/erb.rb

@@ -17,7 +17,7 @@ module ActionView
           src << "@output_buffer.safe_append='"
           src << "\n" * @newline_pending if @newline_pending > 0
           src << escape_text(text)
-          src << "'.freeze;"
+          src << "';"
 
           @newline_pending = 0
         end
@@ -63,7 +63,7 @@ module ActionView
 
       def flush_newline_if_pending(src)
         if @newline_pending > 0
-          src << "@output_buffer.safe_append='#{"\n" * @newline_pending}'.freeze;"
+          src << "@output_buffer.safe_append='#{"\n" * @newline_pending}';"
           @newline_pending = 0
         end
       end

actionpack/test/controller/caching_test.rb

@@ -622,19 +622,6 @@ class FragmentCachingTest < ActionController::TestCase
     assert_equal 'generated till now -> fragment content', buffer
   end
 
-  def test_fragment_for_bytesize
-    buffer = "\xC4\x8D"
-    buffer.force_encoding('ASCII-8BIT')
-
-    @controller.fragment_for(buffer, 'bytesize') do
-      buffer.force_encoding('UTF-8')
-      buffer << "abc"
-    end
-
-    assert_equal Encoding::UTF_8, buffer.encoding
-    assert_equal "abc", @store.read('views/bytesize')
-  end
-
   def test_html_safety
     assert_nil @store.read('views/name')
     content = 'value'.html_safe

activerecord/lib/active_record/base.rb

@@ -3072,7 +3072,7 @@ module ActiveRecord #:nodoc:
       # Interpolate custom SQL string in instance context.
       # Optional record argument is meant for custom insert_sql.
       def interpolate_sql(sql, record = nil)
-        instance_eval("%@#{sql.gsub('@', '\@')}@")
+        sql
       end
 
       # Initializes the attributes array with keys matching the columns from the linked table and

activerecord/test/models/company.rb

@@ -51,13 +51,13 @@ class Firm < Company
   has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
   has_many :clients_with_interpolated_conditions, :class_name => "Client", :conditions => 'rating > #{rating}'
   has_many :clients_like_ms_with_hash_conditions, :conditions => { :name => 'Microsoft' }, :class_name => "Client", :order => "id"
-  has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
+  has_many :clients_using_sql, :class_name => "Client", :finder_sql => proc{"SELECT * FROM companies WHERE client_of = #{id}"}
   has_many :clients_using_counter_sql, :class_name => "Client",
-           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
-           :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = #{id}'
+           :finder_sql  => proc{"SELECT * FROM companies WHERE client_of = #{id}"},
+           :counter_sql => proc{"SELECT COUNT(*) FROM companies WHERE client_of = #{id}"}
   has_many :clients_using_zero_counter_sql, :class_name => "Client",
-           :finder_sql  => 'SELECT * FROM companies WHERE client_of = #{id}',
-           :counter_sql => 'SELECT 0 FROM companies WHERE client_of = #{id}'
+           :finder_sql  => proc{"SELECT * FROM companies WHERE client_of = #{id}"},
+           :counter_sql => proc{"SELECT 0 FROM companies WHERE client_of = #{id}"}
   has_many :no_clients_using_counter_sql, :class_name => "Client",
            :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
            :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'

activerecord/test/models/project.rb

@@ -7,8 +7,8 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers_named_david, :class_name => "Developer", :conditions => "name = 'David'", :uniq => true
   has_and_belongs_to_many :developers_named_david_with_hash_conditions, :class_name => "Developer", :conditions => { :name => 'David' }, :uniq => true
   has_and_belongs_to_many :salaried_developers, :class_name => "Developer", :conditions => "salary > 0"
-  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => 'SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id'
-  has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => "DELETE FROM developers_projects WHERE project_id = \#{id} AND developer_id = \#{record.id}"
+  has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => proc{"SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id"}
+  has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => proc{"DELETE FROM developers_projects WHERE project_id = #{id} AND developer_id = #{record.id}"}
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
                             :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"},

railties/lib/rails_generator/commands.rb

@@ -299,11 +299,7 @@ HELP
             # Evaluate any assignments in a temporary, throwaway binding.
             vars = template_options[:assigns] || {}
             b = template_options[:binding] || binding
-            if b.respond_to?(:local_variable_set)
-              vars.each { |k,v| b.local_variable_set(k, v) }
-            else
-              vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b }
-            end
+            vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b }
 
             # Render the source file with the temporary binding.
             ERB.new(file.read, nil, '-').result(b)

script/cibuild

@@ -4,4 +4,4 @@ set -x
 set -e
 
 script/cibuild-on 1.9.3-p231-tcs-github
-script/cibuild-on 2.1.0-github
+script/cibuild-on 2.0.0-github