Skip to content

Commit a29f432

Browse files
committed
Fix ActiveRecord SQLServer adapter to work with UTF8 version of the Ruby::ODBC module
- The UTF8 version does not appear to support multiple statements in a single query. So things like `query; SELECT @@rowcount` do not work
1 parent 7dadc9a commit a29f432

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@ def internal_exec_sql_query(sql, conn)
6060
end
6161

6262
def exec_delete(sql, name = nil, binds = [])
63-
sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
64-
super(sql, name, binds)
63+
super(sql, name, binds) || super("SELECT @@ROWCOUNT As AffectedRows", "", [])
6564
end
6665

6766
def exec_update(sql, name = nil, binds = [])
68-
sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
69-
super(sql, name, binds)
67+
super(sql, name, binds) || super("SELECT @@ROWCOUNT As AffectedRows", "", [])
7068
end
7169

7270
def begin_db_transaction

0 commit comments

Comments
 (0)