From 0c9fedc6d4b2af0c5df4b1b35ec44e29d97099dc Mon Sep 17 00:00:00 2001 From: X1ting Date: Mon, 18 Mar 2019 09:50:22 +0300 Subject: [PATCH 1/2] #sql_for_insert set table name in case when pk is not nil --- .../connection_adapters/sqlserver/database_statements.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb index 9df2422e8..5753714ad 100644 --- a/lib/active_record/connection_adapters/sqlserver/database_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/database_statements.rb @@ -194,6 +194,7 @@ def sql_for_insert(sql, pk, id_value, sequence_name, binds) end sql = if pk && use_output_inserted? && !database_prefix_remote_server? quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted + table_name ||= get_table_name(sql) exclude_output_inserted = exclude_output_inserted_table_name?(table_name, sql) if exclude_output_inserted id_sql_type = exclude_output_inserted.is_a?(TrueClass) ? 'bigint' : exclude_output_inserted From e55be77ed8c79ca6d2a9760ca1d882f9ddee74d9 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 26 Apr 2019 14:43:16 +0300 Subject: [PATCH 2/2] specify bundler version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efc76819a..7d08391d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - tsql -C install: - export PATH=/opt/local/bin:$PATH - - gem install bundler + - gem install bundler -v 1.17.3 - bundle --version - bundle install script: