Merge branch 'master' of git://github.com/neoryan/rails-sqlserver-adapter

Author: cjheath

.gitignore

@@ -0,0 +1 @@
+debug.log

RUNNING_UNIT_TESTS

@@ -40,5 +40,20 @@ you can do so with:
 
 That'll run the base suite using the SQLServer-Ruby adapter.
 
+== Expected Errors
 
+Currently we expect the following errors from running the test suite:
 
+1. test_add_limit_offset_should_sanitize_sql_injection_for_limit_with_comas
+   from
+   activerecord/test/cases/adapter_test.rb
+   
+2. test_add_limit_offset_should_sanitize_sql_injection_for_limit_without_comas
+   from
+   activerecord/test/cases/adapter_test.rb
+   
+1. & 2. error because we treat the possible values for offset and limit much more 
+aggressively than the intention of the tests.  Rails expects that limit => '1,7 bad sql'
+would turn into ' limit 1,7' but that's not valid SQL Server syntax so why should we 
+bother?  So we just deny non-integer limit / offset params entirely rather than trying
+to sanitize them.  It's a hard-line to take on sql injection, but probably a safer one.

autotest/discover.rb

@@ -0,0 +1,6 @@
+
+Autotest.add_discovery do
+  'sqlserveradapter'
+end
+
+

autotest/sqlserveradapter.rb

@@ -0,0 +1,41 @@
+require 'autotest'
+
+class Autotest::Sqlserveradapter < Autotest
+
+  def initialize
+    super
+    
+    odbc_mode = true
+    
+    clear_mappings
+    
+    self.libs = [
+      "lib",
+      "test",
+      "test/connections/native_sqlserver#{odbc_mode ? '_odbc' : ''}",
+      "../../../rails/activerecord/test/"
+    ].join(File::PATH_SEPARATOR)
+    
+    self.extra_files = ['../../../rails/activerecord/test/']
+    
+    self.add_mapping %r%^test/.*/.*_test_sqlserver.rb$% do |filename, _|
+      filename
+    end
+    
+    self.add_mapping %r%../../../rails/activerecord/test/.*/.*_test.rb$% do |filename, _|
+      filename
+    end
+    
+  end
+  
+  # Have to use a custom reorder method since the normal :alpha for Autotest would put the 
+  # files with ../ in the path before others.
+  def reorder(files_to_test)
+    ar_tests, sqlsvr_tests = files_to_test.partition { |k,v| k.start_with?('../../../') }
+    ar_tests.sort! { |a,b| a[0] <=> b[0] }
+    sqlsvr_tests.sort! { |a,b| a[0] <=> b[0] }
+    sqlsvr_tests + ar_tests
+  end
+  
+end
+