Skip to content

Commit 7719b0d

Browse files
committed
Updated Ruby AppVeyor matrix and handle TinyTDS false result
1 parent eff5023 commit 7719b0d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ clone_depth: 5
44
build: off
55
matrix:
66
fast_finish: true
7-
7+
allow_failures:
8+
- ruby_version: "25"
9+
- ruby_version: "26"
10+
- ruby_version: "27"
11+
- ruby_version: "27-x64"
812
services:
913
- mssql2014
1014

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,12 @@ def sp_executesql_sql(sql, types, params, name)
350350
def raw_connection_do(sql)
351351
case @connection_options[:mode]
352352
when :dblib
353-
@connection.execute(sql).do
353+
result = @connection.execute(sql)
354+
# If connection fails then TinyTDS returns false instead of an exception (see https://github.com/rails-sqlserver/tiny_tds/issues/464)
355+
if result == false
356+
raise TinyTds::Error, 'TinyTDS execute returned false instead of results'
357+
end
358+
result.do
354359
end
355360
ensure
356361
@update_sql = false

0 commit comments

Comments
 (0)