Fixed syntax error from merge

Author: cjheath

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -48,8 +48,8 @@ def self.sqlserver_connection(config) #:nodoc:
       conn["AutoCommit"] = autocommit
       ConnectionAdapters::SQLServerAdapter.new(conn, logger, [driver_url, username, password])
     end
-    
-    
+
+
     private
 
     # Overwrite the ActiveRecord::Base method for SQL server.
@@ -59,7 +59,7 @@ def self.construct_finder_sql_for_association_limiting(options, join_dependency)
       is_distinct = !options[:joins].blank? || include_eager_conditions?(options) || include_eager_order?(options)
 
       sql = "SELECT #{table_name}.#{connection.quote_column_name(primary_key)} FROM #{table_name} "
-      
+
       if is_distinct
         sql << join_dependency.join_associations.collect(&:association_join).join
         add_joins!(sql, options[:joins], scope)
@@ -72,7 +72,7 @@ def self.construct_finder_sql_for_association_limiting(options, join_dependency)
         if sql =~ /GROUP\s+BY/i
           sql << ", #{table_name}.#{connection.quote_column_name(primary_key)}"
         else
-          sql << " GROUP BY #{table_name}.#{connection.quote_column_name(primary_key)}"  
+          sql << " GROUP BY #{table_name}.#{connection.quote_column_name(primary_key)}"
         end #if sql =~ /GROUP BY/i
 
         connection.add_order_by_for_association_limiting!(sql, options)
@@ -84,7 +84,6 @@ def self.construct_finder_sql_for_association_limiting(options, join_dependency)
 
       return sanitize_sql(sql)
     end
-
   end # class Base
 
   module ConnectionAdapters
@@ -197,6 +196,7 @@ def new_time(year, mon, mday, hour, min, sec, microsec = 0)
           return nil if year.nil? || year == 0
           Time.time_with_datetime_fallback(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
         end
+      end
     end
 
     # In ADO mode, this adapter will ONLY work on Windows systems,
@@ -505,7 +505,7 @@ def add_limit_offset!(sql, options)
               #if sql =~ /\.\[/ and tc =~ /\./ # if column quoting used in query
               #  tc.gsub!(/\./, '\\.\\[')
               #  tc << '\\]'
-              #end          
+              #end
               if sql =~ /#{Regexp.escape(tc)} AS (t\d_r\d\d?)/
                 parts[0] = $1
               elsif parts[0] =~ /\w+\.\[?(\w+)\]?/
@@ -523,7 +523,7 @@ def add_limit_offset!(sql, options)
           end unless options[:limit].nil? || options[:limit] < 1
         end
       end #add_limit_offset!(sql, options)
-      
+
       def add_order_by_for_association_limiting!(sql, options)
         return sql if options[:order].blank?
 
@@ -561,7 +561,7 @@ def recreate_database(name)
       def drop_database(name)
         execute "DROP DATABASE #{name}"
       end
-      
+
       # Clear the given table and reset the table's id to 1
       # Argument:
       # +table_name+:: (String) Name of the table to be cleared and reset
@@ -771,7 +771,7 @@ def repair_special_columns(sql)
           end
           sql
         end
-        
+
         def get_utf8_columns(table_name)
           utf8 = []
           @table_columns ||= []
@@ -781,10 +781,10 @@ def get_utf8_columns(table_name)
           end
           utf8
         end
-        
+
         def set_utf8_values!(sql)
           utf8_cols = get_utf8_columns(get_table_name(sql))
-          if sql =~ /^\s*UPDATE/i            
+          if sql =~ /^\s*UPDATE/i
             utf8_cols.each do |col|
               sql.gsub!("[#{col.to_s}] = '", "[#{col.to_s}] = N'")
             end