activerecord-sqlserver-adapter 4.2.13 → 4.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8552fbdd52b41994d42f30eb3b90d3c52a526a
-  data.tar.gz: b9479141228c29d2c3a18de6f560e18616d46d3d
+  metadata.gz: 1d48925cc69817fb38f75ba9ce678d5df931b7d7
+  data.tar.gz: f0cd00edff4e8b9fb009b239368c8cb799e48e66
 SHA512:
-  metadata.gz: 433e09b8658a56f247b23116481bd9fe367ef2ab90de2514cd6ccc34d6f9b3a6880bc13d674e07d02f001009d672c2140a86e8c3025066ae3b9588163109cef9
-  data.tar.gz: 3e797c22d81e5df9c21510411b77c04edf24488b8c11bb437e3fc7c9c979e31381831faa906da44c088c3a8ffd6561fe0b75421bd172f21fac49dbde44f68f2f
+  metadata.gz: 43b840b4991b0584ab46219d2d427adbd28b3c67586726b8367ac124927b3fb05d99ba4034706c4486df66a00dffdd731fc3b1d9cad36be35b0da747e912a1c6
+  data.tar.gz: 09c590c4c7e253e493c130addfee719741b308f453274ecfce1f3da4a4ecc770cf91e18e7600325bf6d89c273e6c6e47070be433502e71ea25d5b92d015da4c6

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## v4.2.15
+
+#### Fixed
+
+* Removed errand puts statment from database tasks.
+* Fix quoting of non-national columns.
+
+
+## v4.2.14
+
+#### Fixed
+
+* Fix rescue constants for optional connection gems. Fixes #475.
+
+
 ## v4.2.13
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-4.2.13
+4.2.15

data/appveyor.yml

@@ -3,7 +3,7 @@ init:
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
   - SET TESTOPTS='-v'
-  - SET TINYTDS_VERSION=1.0.3
+  - SET TINYTDS_VERSION=1.0.4
 clone_depth: 5
 skip_tags: true
 matrix:

data/lib/active_record/connection_adapters/sqlserver/type/char.rb

@@ -21,7 +21,7 @@ module ActiveRecord
             end
 
             def quoted
-              "'#{@value}'"
+              "'#{Utils.quote_string(@value)}'"
             end
 
             def to_s

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -133,7 +133,7 @@ module ActiveRecord
         return false unless @connection
         raw_connection_do 'SELECT 1'
         true
-      rescue TinyTds::Error, ODBC::Error
+      rescue *connection_errors
         false
       end
 
@@ -307,6 +307,13 @@ module ActiveRecord
         configure_connection
       end
 
+      def connection_errors
+        @connection_errors ||= [].tap do |errors|
+          errors << TinyTds::Error if defined?(TinyTds::Error)
+          errors << ODBC::Error if defined?(ODBC::Error)
+        end
+      end
+
       def dblib_connect(config)
         TinyTds::Client.new(
           dataserver: config[:dataserver],

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -61,7 +61,6 @@ module ActiveRecord
         command.concat(table_args)
         view_args = connection.views.map { |v| Shellwords.escape(v) }
         command.concat(view_args)
-        puts command.inspect
         raise 'Error dumping database' unless Kernel.system(command.join(' '))
         dump = File.read(filename)
         dump.gsub!(/^USE .*$\nGO\n/, '')                      # Strip db USE statements

data/test/cases/specific_schema_test_sqlserver.rb

@@ -125,6 +125,16 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: 'T').first }
   end
 
+  it 'can update and hence properly quoted non-national char/varchar columns' do
+    o = SSTestDatatypeMigration.create!
+    o.varchar_col = "O'Reilly"
+    o.save!
+    o.reload.varchar_col.must_equal "O'Reilly"
+    o.varchar_col = nil
+    o.save!
+    o.reload.varchar_col.must_be_nil
+  end
+
   # With column names that have spaces
 
   it 'create record using a custom attribute reader and be able to load it back in' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.13
+  version: 4.2.15
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -251,3 +251,4 @@ test_files:
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb
 - test/support/sql_counter_sqlserver.rb
+has_rdoc: