Pass all tests for DBLIB/TinyTDS connection mode and current state of rails 3.1.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -16,16 +16,16 @@ def execute(sql, name = nil)
         end
 
         def exec_query(sql, name = 'SQL', binds = [])
+          return raw_select(sql, name, binds, :ar_result => true) if binds.empty?
           if id_insert_table_name = query_requires_identity_insert?(sql)
-            with_identity_insert_enabled(id_insert_table_name) do
-              binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
-            end
+            with_identity_insert_enabled(id_insert_table_name) { do_exec_query(sql, name, binds) }
           else
-            binds.empty? ? raw_select(sql, name, binds, :ar_result => true) : do_exec_query(sql, name, binds)
+            do_exec_query(sql, name, binds)
           end
         end
 
         def exec_insert(sql, name, binds)
+          sql = "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
           exec_query(sql, name, binds)
         end
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -39,7 +39,11 @@ def indexes(table_name, name = nil)
 
         def columns(table_name, name = nil)
           return [] if table_name.blank?
+<<<<<<< HEAD
           cache_key = unqualify_table_name(table_name)
+=======
+          cache_key = columns_cache_key(table_name)
+>>>>>>> Pass all tests for DBLIB/TinyTDS connection mode and current state of rails 3.1.
           column_definitions(table_name).collect do |ci|
             sqlserver_options = ci.except(:name,:default_value,:type,:null).merge(:database_year=>database_year)
             SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
@@ -198,8 +202,16 @@ def column_definitions(table_name)
               ELSE 1
             END as is_identity
             FROM #{db_name_with_period}INFORMATION_SCHEMA.COLUMNS columns
+<<<<<<< HEAD
             WHERE columns.TABLE_NAME = @0
+=======
+<<<<<<< HEAD
+            WHERE columns.TABLE_NAME = '#{table_name}'
+>>>>>>> Pass all tests for DBLIB/TinyTDS connection mode and current state of rails 3.1.
               AND columns.TABLE_SCHEMA = #{table_schema.nil? ? "schema_name() " : "'#{table_schema}' "}
+=======
+            WHERE columns.TABLE_NAME = @0
+>>>>>>> Pass all tests for DBLIB/TinyTDS connection mode and current state of rails 3.1.
             ORDER BY columns.ordinal_position
           }.gsub(/[ \t\r\n]+/,' ')
           results = info_schema_query { do_exec_query(sql, 'InfoSchema::ColumnDefinitions', [['table_name', table_name]]) }

test/cases/sqlserver_helper.rb

@@ -82,7 +82,8 @@ def method_added(method)
 module ActiveRecord
   class SQLCounter
     IGNORED_SQL << %r|SELECT SCOPE_IDENTITY| << %r{INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)} << 
-                   %r|SELECT @@IDENTITY| << %r|SELECT @@ROWCOUNT| << %r|SELECT @@version| << %r|SELECT @@TRANCOUNT|
+                   %r|SELECT @@IDENTITY| << %r|SELECT @@ROWCOUNT| << %r|SELECT @@version| << %r|SELECT @@TRANCOUNT| <<
+                   %r{(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION}
 
   end
 end