activerecord-sqlserver-adapter 4.2.16 → 4.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c7985b6dcbd1c96d62b6c252bd260826c5689fa
-  data.tar.gz: 3708a1600a2c515ff4f7605c45079728c10fe254
+  metadata.gz: 1f3710cca4199d458c3582679a22346641e2ea3a
+  data.tar.gz: cd58d819ea28e6a1acfd168c5f9d3720e3d3a53b
 SHA512:
-  metadata.gz: edd7abf4c1cf08d0caf66bae13b7cce3bb715b273572d08e60e8527f671b22c7a2b8ae04164a17b4855960eaf5931c701e01ff35f96aa780828ac68f2aaac843
-  data.tar.gz: e744b5c9cb0969436ae7dbb122f6c9de5ee955b4ca776c7696bc1ecfa6b21addbc604f6f360d47ba1790ee77d9bd2578502d2884380d0a71a572eb041d2159a3
+  metadata.gz: f40dffb58641d640658c7750bfcedfe3fb35a65d7d029ed66c53701b65766a8b9ed9da63eb0442905a174343881e594a4dd8aaf00a4390ca2487b00368c16c2e
+  data.tar.gz: f6bf0939e3a0cd7c1480839675fc8a57ae376985413fa73c6f137682ba329566b9187699efbb8762c82582ae4e9ead22fd08dc8915dc7b947bd3087012f1c21b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v4.2.17
+
+#### Changed
+
+* The `user_options` parsing. Works for hash/array. Fixes #535
+
+
 ## v4.2.16
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-4.2.16
+4.2.17

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

@@ -154,7 +154,9 @@ module ActiveRecord
 
         def user_options
           return {} if sqlserver_azure?
-          select_rows('dbcc useroptions', 'SCHEMA').reduce(HashWithIndifferentAccess.new) do |values, row|
+          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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.16
+  version: 4.2.17
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,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