tidying

Author: Anna

Gemfile

@@ -46,8 +46,6 @@ group :development do
   gem 'rake', '~> 0.9.2'
   gem 'ruby-prof'
   gem 'simplecov'
-  gem 'turn'
-  gem 'rubocop'
   gem 'ruby-graphviz'
 end
 

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -15,6 +15,7 @@ def execute(sql, name = nil)
           end
         end
 
+		# TODO I bet there's a better way than a regex to take care of this
         def exec_query(sql, name = 'SQL', binds = [], sqlserver_options = {})
           # We can't update Identiy columns in sqlserver.  So, strip out the id from the update.
           if sql =~ /UPDATE/ 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -66,7 +66,7 @@ def initialize(name, default, sql_type = nil, null = true, sqlserver_options = {
       class << self
 
         def string_to_binary(value)
-         "0x#{value.unpack("H*")[0]}"
+          "0x#{value.unpack("H*")[0]}"
         end
 
         def binary_to_string(value)

lib/arel/visitors/sqlserver.rb

@@ -28,7 +28,6 @@ class SQLServer < Arel::Visitors::ToSql
       # SQLServer ToSql/Visitor (Overides)
 
       def visit_Arel_Nodes_SelectStatement(o, a)
-        puts "o.cores.size#{o.cores.size}" unless o.cores.size < 2
         if complex_count_sql?(o)
           visit_Arel_Nodes_SelectStatementForComplexCount(o, a)
         elsif o.offset

test/cases/column_test_sqlserver.rb

@@ -7,7 +7,6 @@
 require 'models_sqlserver/sql_server_string'
 require 'models_sqlserver/sql_server_unicode'
 require 'models_sqlserver/table_with_real_column'
-
 require 'models_sqlserver/topic'
 require "cases/migration/helper"
 

test/cases/finder_test_sqlserver.rb

@@ -1,20 +1,38 @@
 require 'cases/sqlserver_helper'
 require 'models/event'
+require 'models/author'
+require 'models/post'
 require 'models_sqlserver/topic'
 
 class FinderTestSqlserver < ActiveRecord::TestCase
 end
 
 class FinderTest < ActiveRecord::TestCase
-
+  fixtures :authors, :author_addresses, :posts
   COERCED_TESTS = [
     :test_exists_does_not_select_columns_without_alias,
     :test_string_sanitation,
-    :test_take_and_first_and_last_with_integer_should_use_sql_limit
+    :test_take_and_first_and_last_with_integer_should_use_sql_limit,
+    :test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
+ 
   ]
 
   include SqlserverCoercedTest
 
+
+  def test_coerced_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
+   p =  Post.all.merge!(:includes => { :authors => :author_address }, 
+      :order => 'author_addresses.id DESC ', 
+      :limit => 2)    
+    arel_to_png(p)
+    assert_equal 2, p.to_a.size
+    puts "*****#{ActiveRecord::SQLCounter.log_all.join("\n\n")}"
+ 
+    assert_equal 3, Post.all.merge!(:includes => { :author => :author_address, :authors => :author_address},
+                              :order => 'author_addresses_authors.id DESC ', :limit => 3).to_a.size
+  end
+
+
   def test_coerced_exists_does_not_select_columns_without_alias
     assert_sql(/SELECT TOP \(1\) 1 AS one FROM \[topics\]/i) do
       Topic.exists?

test/cases/inheritance_test_sqlserver.rb

@@ -24,7 +24,6 @@ def test_coerced_a_bad_type_column
     assert_raise(ActiveRecord::SubclassNotFound) { Company.find(100) }
   end
 
-  
   def test_coerced_eager_load_belongs_to_primary_key_quoting
     con = Account.connection
     assert_sql(/\[companies\]\.\[id\] IN \(N''1''\)/) do

test/models_sqlserver/sql_server_natural_pk_data.rb

@@ -1,4 +1,4 @@
 class SqlServerNaturalPkData < ActiveRecord::Base
   self.table_name = 'natural_pk_data'
-self.primary_key = 'legacy_id'
+  self.primary_key = 'legacy_id'
 end