r1603@asus: jeremy | 2005-07-02 14:38:52 -0700

 Faster MysqlAdapter#select.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1622 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
index dd5a7eb39f..f685a0a787 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -300,8 +300,8 @@ module ActiveRecord
         end
       end
 
-      def quote_string(s)
-        s.gsub(/\'/, "''")
+      def quote_string(string)
+        string.gsub(/\'/, "''")
       end
 
       def quote_column_name(name)
@@ -363,7 +363,7 @@ module ActiveRecord
         end
 
         def has_identity_column(table_name)
-          return get_identity_column(table_name) != nil
+          !get_identity_column(table_name).nil?
         end
 
         def get_identity_column(table_name)
@@ -377,7 +377,7 @@ module ActiveRecord
         end
 
         def query_contains_identity_column(sql, col)
-          return sql =~ /\[#{col}\]/
+          sql =~ /\[#{col}\]/
         end
 
         def change_order_direction(order)