activerecord-sqlserver-adapter 3.2.15 → 3.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03b8c4674cbb043de3f5188816a3fc6badd2aec
-  data.tar.gz: 39771cc9337f0d33907dd2fa3b9af3634aae4611
+  metadata.gz: 726e72febb5f0fd2fecfb88581b92e6af50daac9
+  data.tar.gz: d2feeaa8cf3353c3551f4785fcb1f1e4006ef851
 SHA512:
-  metadata.gz: 5ddaf90e91c344f1d69d5a90233979a7a956c57b3728af903d54daa1fe534623a140e755672bbfad12ab8f63d03d6a2b75737822d0cb08c39f227f20d219fb95
-  data.tar.gz: 47de6c9473cc304be30f2baa8bfc1c75e015f41ba29a291dbaa6ac2ac60534a3c3d194f491f1a667af81a671689241aa90fd79fd1eeb855f2ee82cb85f5d9fe3
+  metadata.gz: 1091df35f40b10a76aeda89647cea24196822a14a2f730f6741c73a499bb77aac4dd1eea94b1cdeca20e25f0948d54efe94ca4e7ac044ba649081309b321d4cc
+  data.tar.gz: 1e7e1738c77ad41a15f0bbd298c99c3dbc1d69c037973e04a9b5e63ab48f3c9becc1336c701553cf9ad8a511c0b21c3e3ccd4d79d2cde91d30bdac07f20bca93

data/CHANGELOG

@@ -1,3 +1,7 @@
+* 3.2.16 *
+
+* All user optons to be array/hash. Fixes #540
+
 * 3.2.15 *
 
 * Added vNext support.

data/VERSION

@@ -1 +1 @@
-3.2.15
+3.2.16

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -135,9 +135,17 @@ module ActiveRecord
         
         def user_options
           return {} if sqlserver_azure?
-          select_rows("dbcc useroptions",'SCHEMA').inject(HashWithIndifferentAccess.new) do |values,row| 
-            set_option = row[0].gsub(/\s+/,'_')
-            user_value = row[1]
+          # fixes #535
+          rows = select_rows('dbcc useroptions', 'SCHEMA')
+          rows = rows.first if rows.size == 2 && rows.last.empty?
+          rows.reduce(HashWithIndifferentAccess.new) do |values, row|
+            if row.instance_of? Hash
+              set_option = row.values[0].gsub(/\s+/, '_')
+              user_value = row.values[1]
+            elsif  row.instance_of? Array
+              set_option = row[0].gsub(/\s+/, '_')
+              user_value = row[1]
+            end
             values[set_option] = user_value
             values
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.15
+  version: 3.2.16
 platform: ruby
 authors:
 - Ken Collins
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord