Cleanup

Author: aidanharan

docker-compose.ci.yml

@@ -9,6 +9,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.ci
-    command: wait-for sqlserver:1433 -- bundle exec rake test TESTOPTS="-v"
+    command: wait-for sqlserver:1433 -- bundle exec rake test
     depends_on:
       - "sqlserver"

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -14,8 +14,6 @@ def write_query?(sql) # :nodoc:
         end
 
         def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
-          # puts "raw_execute: #{sql}" if $AIDO
-
           log(sql, name, async: async) do |notification_payload|
             with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
               result = if id_insert_table_name = query_requires_identity_insert?(sql)
@@ -314,11 +312,8 @@ def sql_for_insert(sql, pk, binds, returning)
         # === SQLServer Specific ======================================== #
 
         def set_identity_insert(table_name, conn, enable)
-          # puts "set_identity_insert: #{table_name} #{enable}"
-
           internal_raw_execute("SET IDENTITY_INSERT #{table_name} #{enable ? 'ON' : 'OFF'}", conn , perform_do: true)
         rescue Exception
-          puts "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
           raise ActiveRecordError, "IDENTITY_INSERT could not be turned #{enable ? 'ON' : 'OFF'} for table #{table_name}"
         end
 
@@ -409,37 +404,12 @@ def exclude_output_inserted_id_sql_type(pk, exclude_output_inserted)
         end
 
         def query_requires_identity_insert?(sql)
-          # puts "query_requires_identity_insert?: #{sql}" if $AIDO
-
           return false unless insert_sql?(sql)
 
           raw_table_name = get_raw_table_name(sql)
-
-          # binding.pry
-          # if $AIDO
-          #
-          #   puts "xxxx"
-          #   return true
-          # end
-
-
-
-
           id_column = identity_columns(raw_table_name).first
 
-
-          if id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i
-
-            # puts "xxx: raw_table_name=#{raw_table_name}, id_column=#{id_column.name}" if $AIDO
-            # puts "xxx: quoted=#{SQLServer::Utils.extract_identifiers(raw_table_name).quoted}" if $AIDO
-
-            SQLServer::Utils.extract_identifiers(raw_table_name).quoted
-          else
-            false
-
-          end
-
-          # id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? SQLServer::Utils.extract_identifiers(raw_table_name).quoted : false
+          id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? SQLServer::Utils.extract_identifiers(raw_table_name).quoted : false
         end
 
         def insert_sql?(sql)
@@ -483,8 +453,6 @@ def finish_statement_handle(handle)
         # Getting around this by raising an exception ourselves while PR
         # https://github.com/rails-sqlserver/tiny_tds/pull/469 is not released.
         def internal_raw_execute(sql, conn, perform_do: false)
-          # puts "internal_raw_execute: #{sql}" if $AIDO
-
           result = conn.execute(sql).tap do |_result|
             raise TinyTds::Error, "failed to execute statement" if _result.is_a?(FalseClass)
           end

test/cases/adapter_test_sqlserver.rb

@@ -233,6 +233,30 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     it "return an empty array when calling #identity_columns for a table_name with no identity" do
       _(connection.send(:identity_columns, Subscriber.table_name)).must_equal []
     end
+
+    it "identity insert enabled for cross database insert" do
+      arunit_connection = Dog.lease_connection
+      arunit2_connection = OtherDog.lease_connection
+
+      arunit_database = arunit_connection.pool.db_config.database
+      arunit2_database = arunit2_connection.pool.db_config.database
+
+      sql = <<~SQL
+        INSERT INTO #{arunit2_database}.dbo.dogs(id) SELECT id FROM #{arunit_database}.dbo.dogs
+      SQL
+
+      OtherDog.destroy_all
+
+      assert Dog.count, 1
+      assert OtherDog.count, 0
+
+      assert_nothing_raised do
+        arunit_connection.execute(sql)
+      end
+
+      assert Dog.count, 1
+      assert OtherDog.count, 1
+    end
   end
 
   describe "quoting" do

test/cases/temp_test_sqlserver.rb

@@ -8,39 +8,4 @@ class TempTestSQLServer < ActiveRecord::TestCase
   # it "assert true" do
   #   assert true
   # end
-
-  it "insert from one schema to another using raw SQL" do
-    arunit_connection = Dog.lease_connection
-    arunit2_connection = OtherDog.lease_connection
-
-    arunit_database = arunit_connection.pool.db_config.database
-    arunit2_database = arunit2_connection.pool.db_config.database
-
-    sql = <<~SQL
-      INSERT INTO #{arunit2_database}.dbo.dogs(id) SELECT id FROM #{arunit_database}.dbo.dogs (NOLOCK)
-    SQL
-
-    #ActiveSupport::Notifications.subscribe('sql.active_record') do |_name, _start, _finish, _id, payload|
-      #puts payload[:sql]
-    #end
-
-    OtherDog.destroy_all
-
-    assert Dog.count, 1
-    assert OtherDog.count, 0
-
-
-    arunit_connection.transaction do
-
-      # binding.pry
-      puts "*** isolation level=#{arunit_connection.user_options_isolation_level}"
-      assert_nothing_raised do
-        arunit_connection.execute(sql)
-      end
-
-    end
-
-    assert Dog.count, 1
-    assert OtherDog.count, 1
-  end
 end