Misc PR feedback. Thanks @sgrif

Author: metaskills

lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -5,12 +5,11 @@ module CoreExt
         module Explain
 
           SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '.freeze
-          SQLSERVER_PARAM_MATCHER = /@\d+ = (.*)/.freeze
-          SQLSERVER_NATIONAL_STRING_MATCHER = /N'(.*)'/m.freeze
+          SQLSERVER_PARAM_MATCHER = /@\d+ = (.*)/
+          SQLSERVER_NATIONAL_STRING_MATCHER = /N'(.*)'/m
 
           def exec_explain(queries)
-            unprepared_queries = queries.map do |sql_binds|
-              sql, binds = sql_binds
+            unprepared_queries = queries.map do |(sql, binds)|
               [unprepare_sqlserver_statement(sql), binds]
             end
             super(unprepared_queries)

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -20,8 +20,7 @@ def exec_query(sql, name = 'SQL', binds = [], sqlserver_options = {})
         end
 
         def exec_insert(sql, name, binds, pk = nil, _sequence_name = nil)
-          id_insert_table_name = query_requires_identity_insert?(sql) if pk
-          if id_insert_table_name
+          if pk && id_insert_table_name = query_requires_identity_insert?(sql)
             with_identity_insert_enabled(id_insert_table_name) { exec_query(sql, name, binds) }
           else
             exec_query(sql, name, binds)

test/cases/schema_dumper_test_sqlserver.rb

@@ -176,7 +176,7 @@ def assert_line(column_name, options={})
 
   class SchemaLine
 
-    LINE_PARSER = %r{t\.(\w+)\s+"(.*?)"[,\s+](.*)}.freeze
+    LINE_PARSER = %r{t\.(\w+)\s+"(.*?)"[,\s+](.*)}
 
     attr_reader :line,
                 :type_method,