removed deprecated artiverecord syntax

Author: Anna

lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb

@@ -13,7 +13,7 @@ def call(*args)
           IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
           SQLSERVER_EXPLAINED_SQLS = /(select|update|delete|insert)/i
 
-          # Need to modify the regex for the TSQL generated by this adapter so we can explain the proper sql statements
+          # TODO Need to modify the regex for the TSQL generated by this adapter so we can explain the proper sql statements
           def ignore_sqlserver_payload?(payload)
             payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) || payload[:sql] !~ SQLSERVER_EXPLAINED_SQLS
           end

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -25,6 +25,7 @@ def exec_query(sql, name = 'SQL', binds = [], sqlserver_options = {})
           end
         end
 
+		# TODO do something with added params.  Rails 4 added 2 parameters and we're not using them.
         def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
           exec_query sql, name, binds, :insert => true
         end
@@ -128,15 +129,19 @@ def use_database(database=nil)
         def user_options
           return {} if sqlserver_azure?
           select_rows("dbcc useroptions",'SCHEMA').inject(HashWithIndifferentAccess.new) do |values,row|
-            set_option = row.values[0].gsub(/\s+/,'_') if row.instance_of? Hash
-            set_option = row[0].gsub(/\s+/,'_') if row.instance_of? Array
-            user_value = row.values[1]  if row.instance_of? Hash
-            user_value = row[1]  if row.instance_of? Array
+            if row.instance_of? Hash
+			  set_option = row.values[0].gsub(/\s+/,'_') 
+			  user_value = row.values[1] 
+			elsif  row.instance_of? Array
+		      set_option = row[0].gsub(/\s+/,'_')
+            	  user_value = row[1]
+			end
             values[set_option] = user_value
             values
           end
         end
 
+        # TODO Rails 4 now supports isolation levels
         def user_options_dateformat
           if sqlserver_azure?
             select_value 'SELECT [dateformat] FROM [sys].[syslanguages] WHERE [langid] = @@LANGID', 'SCHEMA'

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -50,8 +50,6 @@ def rename_table(table_name, new_name)
 
         def remove_column(table_name, column_name, type = nil)
           raise ArgumentError.new("You must specify at least one column name.  Example: remove_column(:people, :first_name)") if (column_name.is_a? Array)
-          # TODO: this deprecation warning should be fixed or removed
-          # ActiveSupport::Deprecation.warn 'Passing multiple arguments to remove_columns is deprecated, please use just one column name, like: `remove_columns(:posts, :column_name, :type)`', caller if column_name
           remove_check_constraints(table_name, column_name)
           remove_default_constraint(table_name, column_name)
           remove_indexes(table_name, column_name)
@@ -271,8 +269,6 @@ def get_table_name(sql)
           elsif sql =~ /FROM\s+([^\(\s]+)\s*/i
             $1
           else
-            # TODO:
-            puts sql
             nil
           end
         end

test/cases/method_scoping_test_sqlserver.rb

@@ -12,13 +12,13 @@ class NestedScopingTest < ActiveRecord::TestCase
 
   fixtures :developers
 
-  
+  # TODO update test for rails 4
   def test_coerced_test_merged_scoped_find
     poor_jamis = developers(:poor_jamis)
     Developer.send(:with_scope, :find => { :conditions => "salary < 100000" }) do
       Developer.send(:with_scope, :find => { :offset => 1, :order => 'id asc' }) do
         assert_sql /ORDER BY id asc/i do
-          assert_equal(poor_jamis, Developer.first(:order => 'id asc'))
+          assert_equal(poor_jamis, Developer.order('id asc').first)
         end
       end
     end

test/cases/offset_and_limit_test_sqlserver.rb

@@ -21,15 +21,15 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
   context 'When selecting with limit' do
 
     should 'alter sql to limit number of records returned' do
-      assert_sql(/SELECT TOP \(10\)/) { Book.limit(10).all }
+      assert_sql(/SELECT TOP \(10\)/) { Book.limit(10) }
     end
 
   end
 
   context 'When selecting with offset' do
 
     should 'have limit (top) of 9223372036854775807 if only offset is passed' do
-      assert_sql(/SELECT TOP \(9223372036854775807\) \[__rnt\]\.\* FROM.*WHERE \[__rnt\]\.\[__rn\] > \(1\)/) { Book.all(:offset=>1) }
+      assert_sql(/SELECT TOP \(9223372036854775807\) \[__rnt\]\.\* FROM.*WHERE \[__rnt\]\.\[__rn\] > \(1\)/) { Book.offset(1) }
     end
 
     should 'support calling exists?' do
@@ -47,12 +47,12 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
 
     should 'alter SQL to limit number of records returned offset by specified amount' do
       sql = %|EXEC sp_executesql N'SELECT TOP (3) [__rnt].* FROM ( SELECT ROW_NUMBER() OVER (ORDER BY [books].[id] ASC) AS [__rn], [books].* FROM [books] ) AS [__rnt] WHERE [__rnt].[__rn] > (5) ORDER BY [__rnt].[__rn] ASC'|
-      assert_sql(sql) { Book.limit(3).offset(5).all }
+      assert_sql(sql) { Book.limit(3).offset(5) }
     end
 
     should 'add locks to deepest sub select' do
       pattern = /FROM \[books\]\s+WITH \(NOLOCK\)/
-      assert_sql(pattern) { Book.all :limit => 3, :offset => 5, :lock => 'WITH (NOLOCK)' }
+      assert_sql(pattern) { Book.load :limit => 3, :offset => 5, :lock => 'WITH (NOLOCK)' }
       assert_sql(pattern) { Book.count :limit => 3, :offset => 5, :lock => 'WITH (NOLOCK)' }
     end
 

test/cases/session_test_sqlserver.rb

@@ -1,7 +1,6 @@
 require 'cases/sqlserver_helper'
 require 'action_dispatch'
-# TODO: require 'active_record/session_store'
-# Active Record's Session Store extracted from Rails
+
 module ActiveRecord
   class SessionStore
     class SessionTest < ActiveRecord::TestCase

test/cases/specific_schema_test_sqlserver.rb

@@ -76,7 +76,7 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
 
       should 'use primary key for row table order in pagination sql' do
         sql = /OVER \(ORDER BY \[natural_pk_data\]\.\[legacy_id\] ASC\)/
-        assert_sql(sql) { SqlServerNaturalPkData.limit(5).offset(5).all }
+        assert_sql(sql) { SqlServerNaturalPkData.limit(5).offset(5) }
       end
 
     end
@@ -113,11 +113,11 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
       teardown { @edge_class.delete_all }
 
       should 'allow all sorts of ordering without adapter munging it up' do
-        assert_equal ['A','B','C'], @edge_class.all(:order => 'description').map(&:description)
-        assert_equal ['A','B','C'], @edge_class.all(:order => 'description asc').map(&:description)
-        assert_equal ['A','B','C'], @edge_class.all(:order => 'description ASC').map(&:description)
-        assert_equal ['C','B','A'], @edge_class.all(:order => 'description desc').map(&:description)
-        assert_equal ['C','B','A'], @edge_class.all(:order => 'description DESC').map(&:description)
+        assert_equal ['A','B','C'], @edge_class.load.order('description').map(&:description)
+        assert_equal ['A','B','C'], @edge_class.load.order('description asc').map(&:description)
+        assert_equal ['A','B','C'], @edge_class.load.order('description ASC').map(&:description)
+        assert_equal ['C','B','A'], @edge_class.load.order('description desc').map(&:description)
+        assert_equal ['C','B','A'], @edge_class.load.order('description DESC').map(&:description)
       end
 
     end

test/config.yml

@@ -9,7 +9,7 @@ default_connection_info: &default_connection_info
   username: <%= ENV['ACTIVERECORD_UNITTEST_USER'] || 'rails' %>
   password: <%= ENV['ACTIVERECORD_UNITTEST_PASS'] || '' %>
   azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
-  timeout: 0
+
 connections:
 
   dblib: