Merged in everyone elses stuff and the tweaked / commented the single major issue that arose (construct_finder_sql)

Author: h-lame

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -62,14 +62,17 @@ def self.sqlserver_connection(config) #:nodoc:
     # In the case of SQL server, the lock value must follow the FROM clause
     # Mysql:     SELECT * FROM tst where testID = 10 LOCK IN share mode
     # SQLServer: SELECT * from tst WITH (HOLDLOCK, ROWLOCK) where testID = 10
+    # h-lame: OK, so these 2 methods should be a patch to rails ideally, so we don't
+    #         have to play catch up against rails itself should construct_finder_sql ever
+    #         change
     def self.construct_finder_sql(options)
       scope = scope(:find)
       sql  = "SELECT #{options[:select] || (scope && scope[:select]) || ((options[:joins] || (scope && scope[:joins])) && quoted_table_name + '.*') || '*'} "
       sql << "FROM #{(scope && scope[:from]) || options[:from] || quoted_table_name} "
 
       add_lock!(sql, options, scope) if ActiveRecord::Base.connection.adapter_name == "SQLServer" && !options[:lock].blank? # SQLServer
 
-      add_joins!(sql, options, scope)
+      add_joins!(sql, options[:joins], scope)
       add_conditions!(sql, options[:conditions], scope)
 
       add_group!(sql, options[:group], scope)